diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-12-02 09:16:23 -0600 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-12-02 09:16:23 -0600 |
| commit | 890a5e00efb51af037adf98974c2a5baa7e8232b (patch) | |
| tree | 2627c55b95c960a01d794ac548311da9a260388f /Carpet/CarpetIOScalar | |
| parent | c8542a49b18ff96dcf976f27ed0bd3bb3f382234 (diff) | |
| parent | 7508dd65e2eb4c40cea97f4d0595e42d93bc42c3 (diff) | |
Merge branch 'master' of /Users/eschnett/Cbeta/carpet/
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; } |