diff options
| author | Thomas Radke <tradke@aei.mpg.de> | 2006-08-18 16:46:00 +0000 |
|---|---|---|
| committer | Thomas Radke <tradke@aei.mpg.de> | 2006-08-18 16:46:00 +0000 |
| commit | f4526cf65b84e0632dbe983622b5611a87fbf09f (patch) | |
| tree | 01210ebaf04ea84fd3d7c789684b5c661b79cfe5 /Carpet/CarpetIOScalar | |
| parent | 636e4bd1299120afafc637892d3be17b88b2442e (diff) | |
CarpetIOScalar: mergeCarpetIOScalar.pl support for non-CarpetIOScalar output files
When sorting datasets by their first column, accept both an (integer) iteration
number or a (real) timestep value.
darcs-hash:20060818164622-776a0-58446b69d8874c3cdfe687f5a8184c25f89d7dda.gz
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 e4680a893..adddd37d1 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: # vermerke den Datensatz mit seiner Iterationsnummer - ++$timesteps{$1} if (/^(\d+)\s/); + ++$timesteps{$1} if (/^(\d+(.\d+)?)\s/); } # stelle die Liste aller Eingabe-Dateien wieder her @@ -57,5 +57,5 @@ while (<>) { # falls diese Zeile eine Datenzeile ist: # ueberspringe alle Datensaetze mit dieser Iterationsnummer # bis auf den letzten - print unless (/^(\d+)\s/ and --$timesteps{$1} > 0); + print unless (/^(\d+(.\d+)?)\s/ and --$timesteps{$1} > 0); } |