diff options
author | Thomas Radke <tradke@damiana.damiana.admin> | 2008-12-02 12:56:38 +0100 |
---|---|---|
committer | Thomas Radke <tradke@damiana.damiana.admin> | 2008-12-02 12:56:38 +0100 |
commit | 7508dd65e2eb4c40cea97f4d0595e42d93bc42c3 (patch) | |
tree | a7a05a32ee509adf3b5101bab9245c449a5e607c /Carpet/CarpetIOScalar | |
parent | bf6e1eff14c7dc6bf378d14bf4759c43e4751296 (diff) |
CarpetIOScalar: adapt mergeCarpetIOScalar.pl script to accept both an iteration number and a physical simulation time in the first data column
Diffstat (limited to 'Carpet/CarpetIOScalar')
-rwxr-xr-x | Carpet/CarpetIOScalar/src/util/mergeCarpetIOScalar.pl | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |