From 7508dd65e2eb4c40cea97f4d0595e42d93bc42c3 Mon Sep 17 00:00:00 2001
From: Thomas Radke <tradke@damiana.damiana.admin>
Date: Tue, 2 Dec 2008 12:56:38 +0100
Subject: CarpetIOScalar: adapt mergeCarpetIOScalar.pl script to accept both an
 iteration number and a physical simulation time in the first data column

---
 Carpet/CarpetIOScalar/src/util/mergeCarpetIOScalar.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Carpet/CarpetIOScalar')

diff --git a/Carpet/CarpetIOScalar/src/util/mergeCarpetIOScalar.pl b/Carpet/CarpetIOScalar/src/util/mergeCarpetIOScalar.pl
index 2b24086b9..3aae60c3b 100755
--- a/Carpet/CarpetIOScalar/src/util/mergeCarpetIOScalar.pl
+++ b/Carpet/CarpetIOScalar/src/util/mergeCarpetIOScalar.pl
@@ -45,7 +45,7 @@ while (<>) {
 
   # falls diese Zeile eine Datenzeile ist:
   # merke den Datensatz mit seinem Zeitschritt
-  $timesteps{$1} = $_ if (/^(\d+)\s+/);
+  $timesteps{$1} = $_ if (/^(\d+(\.\d+)?)\s+/);
 }
 
 # stelle die Liste aller Eingabe-Dateien wieder her
@@ -54,7 +54,7 @@ while (<>) {
 # lies zeilenweise alle Eingabe-Dateien
 while (<>) {
   # gib alle Zeilen bis zur ersten Datenzeile aus
-  last if (/^\d+\s+/);
+  last if (/^\d+(\.\d+)?\s+/);
   print;
 }
 
-- 
cgit v1.2.3