global netCDF attribute source missing (bug fix)

f2cd6326 · Uwe Schulzweida · 029c9e8f · f2cd6326 · f2cd6326
Commit f2cd6326 authored Jan 08, 2013 by Uwe Schulzweida
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

ChangeLog ChangeLog +4 -0

src/stream_cdf.c src/stream_cdf.c +5 -4

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+2013-01-08  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+
+	* global netCDF attribute "source" missing (bug fix)
+
 2012-12-18  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>

 	* reshGetValue: added caller function name to error message

--- a/src/stream_cdf.c
+++ b/src/stream_cdf.c
@@ -6284,10 +6284,9 @@ void define_all_vars(int streamID, int vlistID, int instID, int modelID, int *va
 		  tableID = cdiDefaultTableID;
 		}
 	    }
-	  if ( cdiDefaultModelID != UNDEFID )
-	    modelID = cdiDefaultModelID;
-	  if ( cdiDefaultInstID != UNDEFID )
-	    instID = cdiDefaultInstID;
+
+	  if ( cdiDefaultModelID != UNDEFID ) modelID = cdiDefaultModelID;
+	  if ( cdiDefaultInstID  != UNDEFID ) instID  = cdiDefaultInstID;
 	}
      if ( instID  != UNDEFID ) vlistDefVarInstitut(vlistID, varID, instID);
      if ( modelID != UNDEFID ) vlistDefVarModel(vlistID, varID, modelID);
@@ -6330,6 +6329,8 @@ void read_global_attributtes(int fileID, int vlistID, stream_t *streamptr, int n
 	      else if ( strcmp(attname, "source") == 0 )
 		{
 		  *modelID = modelInq(-1, 0, attstring);
+		  if ( *modelID == UNDEFID )
+		    *modelID = modelDef(-1, 0, attstring);
 		}
 	      else if ( strcmp(attname, "Source") == 0 )
 		{