Commit 4c632512 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

inputsrv: use -f format if set (bug fix)

parent e9a719fc
......@@ -11,6 +11,7 @@
* sellonlatbox: bug fix for curvilinear grids
* setzaxis: change float to double (bug fix) [report: Pier Giuseppe Fogli]
* Arith: add filltype FILL_RECTS [request: Wolfgang Mueller]
* inputsrv: use -f format if set (bug fix)
* Seasstat: warning message for seasons with less than 3 input time steps
* remapcon: change max_subseg from 100000 to 1000
* remapbil: 2. bug fix for cross_product eq zero
......
......@@ -2,7 +2,7 @@
This file is part of CDO. CDO is a collection of Operators to
manipulate and analyse Climate model Data.
Copyright (C) 2003-2008 Uwe Schulzweida, Uwe.Schulzweida@zmaw.de
Copyright (C) 2003-2009 Uwe Schulzweida, Uwe.Schulzweida@zmaw.de
See COPYING file for copying and redistribution conditions.
This program is free software; you can redistribute it and/or modify
......@@ -136,7 +136,8 @@ void *Input(void *argument)
}
else if ( operatorID == INPUTEXT )
{
output_filetype = FILETYPE_EXT;
output_filetype = cdoDefaultFileType;
if ( output_filetype == CDI_UNDEFID ) output_filetype = FILETYPE_EXT;
cdoPrint("Enter header (code,level,date,time,nlon,nlat,dispo1,dispo2)"
" of record %d (or EOF(=^D))!", nrecs+1);
......@@ -180,7 +181,8 @@ void *Input(void *argument)
}
else if ( operatorID == INPUTSRV )
{
output_filetype = FILETYPE_SRV;
output_filetype = cdoDefaultFileType;
if ( output_filetype == CDI_UNDEFID ) output_filetype = FILETYPE_SRV;
cdoPrint("Enter header (code,level,date,time,nlon,nlat,dispo1,dispo2)"
" of record %d (or EOF(=^D))!", nrecs+1);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment