From 5890fa36427bdea8efe70079e3cd1e5612312e77 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Wed, 4 Jul 2012 01:25:29 +0000
Subject: Introduce cctk_ash, retire cctk_lssh

Introduce cctk_ash, describing the process-local array shape that has
been allocated. This may be larger than cctk_lsh, the process-local
shape that should be used.

Retire cctk_lssh and related infrastructure to handle staggered grid
functions.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@4841 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 lib/sbin/GridFuncStuff.pl    |  6 ++----
 lib/sbin/InterLatex.pl       |  4 +---
 lib/sbin/interface_parser.pl | 26 --------------------------
 3 files changed, 3 insertions(+), 33 deletions(-)

(limited to 'lib')

diff --git a/lib/sbin/GridFuncStuff.pl b/lib/sbin/GridFuncStuff.pl
index fde9dfce..0e9047cb 100644
--- a/lib/sbin/GridFuncStuff.pl
+++ b/lib/sbin/GridFuncStuff.pl
@@ -374,11 +374,11 @@ sub GetThornArguments
             my $dim1=$dim+1;
             if ($dim<3)
             {
-              $type .= "${sep}cctk_lsh$dim1";
+              $type .= "${sep}cctk_ash$dim1";
             }
             else
             {
-              $type .= "${sep}cctk_lsh($dim1)";
+              $type .= "${sep}cctk_ash($dim1)";
             }
           }
           $sep = ',';
@@ -1004,8 +1004,6 @@ sub CreateThornGroupInitialisers
           . ',';
     push(@data, $line);
     $line = '                         "'
-          . $rhinterface_db->{"\U$thorn GROUP $group\E STYPE"}
-          . '", "'
           . $rhinterface_db->{"\U$thorn GROUP $group\E DISTRIB"}
           . '",';
     push(@data, $line);
diff --git a/lib/sbin/InterLatex.pl b/lib/sbin/InterLatex.pl
index b27f4f0b..cb558948 100755
--- a/lib/sbin/InterLatex.pl
+++ b/lib/sbin/InterLatex.pl
@@ -469,9 +469,7 @@ sub ExpandGroupName
 {
    my $name = shift;
 
-   if ($name eq "stype") {
-       return "stagger type";
-    } elsif ($name eq "gtype") {
+   if ($name eq "gtype") {
        return "group type";
     } elsif ($name eq "dim") { 
        return "dimensions";
diff --git a/lib/sbin/interface_parser.pl b/lib/sbin/interface_parser.pl
index b5b0266a..2746030e 100644
--- a/lib/sbin/interface_parser.pl
+++ b/lib/sbin/interface_parser.pl
@@ -535,23 +535,6 @@ sub check_implementation_consistency
         {
           $attributes{"DIM"} = $interface_data_ref->{"\U$thorn GROUP $group\E DIM"};
         }
-
-        # Check the staggering are consistant
-        if($attributes{"STYPE"})
-        {
-          if($attributes{"STYPE"} ne $interface_data_ref->{"\U$thorn GROUP $group\E STYPE"})
-          {
-            $message  = "Inconsistent implementations of $implementation\n";
-            $message .= "Implemented by thorns " . join(" ", @thorns) . "\n";
-            $message .= "Group $group has inconsistent staggering type";
-            &CST_error(0,$message,"",__LINE__,__FILE__);
-            $n_errors++;
-          }
-        }
-        else
-        {
-          $attributes{"STYPE"} = $interface_data_ref->{"\U$thorn GROUP $group\E STYPE"};
-        }
       }
     }
   }
@@ -881,10 +864,6 @@ sub parse_interface_ccl
         {
           $interface_data_ref->{"\U$thorn GROUP $current_group\E DIM"} = $options{$option};
         }
-        elsif($option =~ m:STAGGER:i)
-        {
-          $interface_data_ref->{"\U$thorn GROUP $current_group\E STYPE"} = "\U$options{$option}\E";
-        }
         elsif($option =~ m:TYPE:i)
         {
           $interface_data_ref->{"\U$thorn GROUP $current_group\E GTYPE"} = "\U$options{$option}\E";
@@ -950,11 +929,6 @@ sub parse_interface_ccl
         $interface_data_ref->{"\U$thorn GROUP $current_group\E TIMELEVELS"} = 1;
       }
 
-      if(! $interface_data_ref->{"\U$thorn GROUP $current_group\E STYPE"})
-      {
-        $interface_data_ref->{"\U$thorn GROUP $current_group\E STYPE"} = "NONE";
-      }
-
       if(! $interface_data_ref->{"\U$thorn GROUP $current_group\E DISTRIB"})
       {
         if ($interface_data_ref->{"\U$thorn GROUP $current_group\E GTYPE"} eq 'SCALAR')
-- 
cgit v1.2.3