Commit bd2b3bb1 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Removed variable ECMWF, MPIMET, DWD and MCH.

parent b8d73d94
......@@ -15,11 +15,6 @@
#include "institution.h"
static int ECMWF = CDI_UNDEFID,
DWD = CDI_UNDEFID,
MPIMET = CDI_UNDEFID,
MCH = CDI_UNDEFID;
typedef struct
{
int self;
......@@ -62,19 +57,19 @@ void instituteDefaultValue ( institute_t * instituteptr )
void instituteDefaultEntries ( void )
{
cdiResH resH[]
= { ECMWF = institutDef( 98, 0, "ECMWF", "European Centre for Medium-Range Weather Forecasts"),
MPIMET = institutDef(252, 1, "MPIMET", "Max-Planck-Institute for Meteorology"),
institutDef( 98, 255, "MPIMET", "Max-Planck-Institute for Meteorology"),
institutDef( 98, 232, "MPIMET", "Max Planck Institute for Meteorology"),
DWD = institutDef( 78, 255, "DWD", "Deutscher Wetterdienst"),
institutDef( 78, 0, "DWD", "Deutscher Wetterdienst"),
MCH = institutDef(215, 255, "MCH", "MeteoSwiss"),
institutDef( 7, 0, "NCEP", "National Centers for Environmental Prediction"),
institutDef( 7, 1, "NCEP", "National Centers for Environmental Prediction"),
institutDef( 60, 0, "NCAR", "National Center for Atmospheric Research"),
institutDef( 74, 0, "METOFFICE", "U.K. Met Office"),
institutDef( 97, 0, "ESA", "European Space Agency"),
institutDef( 99, 0, "KNMI", "Royal Netherlands Meteorological Institute"),
= { institutDef( 98, 0, "ECMWF", "European Centre for Medium-Range Weather Forecasts"),
institutDef(252, 1, "MPIMET", "Max-Planck-Institute for Meteorology"),
institutDef( 98, 232, "MPIMET", "Max Planck Institute for Meteorology"),
institutDef( 98, 255, "MPIMET", "Max-Planck-Institute for Meteorology"),
institutDef( 78, 255, "DWD", "Deutscher Wetterdienst"),
institutDef( 78, 0, "DWD", "Deutscher Wetterdienst"),
institutDef(215, 255, "MCH", "MeteoSwiss"),
institutDef( 7, 0, "NCEP", "National Centers for Environmental Prediction"),
institutDef( 7, 1, "NCEP", "National Centers for Environmental Prediction"),
institutDef( 60, 0, "NCAR", "National Center for Atmospheric Research"),
institutDef( 74, 0, "METOFFICE", "U.K. Met Office"),
institutDef( 97, 0, "ESA", "European Space Agency"),
institutDef( 99, 0, "KNMI", "Royal Netherlands Meteorological Institute"),
};
/* (void) institutDef( 0, 0, "IPSL", "IPSL (Institut Pierre Simon Laplace, Paris, France)"); */
......
......@@ -447,7 +447,6 @@ int tableInq(int modelID, int tablenum, const char *tablename)
if ( tablename )
{
size_t len;
strcpy(tablefile, tablename);
/*
printf("tableInq: tablefile = >%s<\n", tablefile);
......@@ -458,7 +457,7 @@ int tableInq(int modelID, int tablenum, const char *tablename)
if ( parTable[tableID].used && parTable[tableID].name )
{
/* len = strlen(parTable[tableID].name); */
len = strlen(tablename);
size_t len = strlen(tablename);
if ( memcmp(parTable[tableID].name, tablename, len) == 0 ) break;
}
}
......
......@@ -1246,9 +1246,9 @@ void tableDefault(void)
// define table : echam5
{
int instID = institutInq(0, 0, "MPIMET", NULL);
int instID = institutInq(98, 232, "MPIMET", NULL);
if ( instID == -1 )
instID = institutDef(0, 0, "MPIMET", NULL);
instID = institutDef(98, 232, "MPIMET", NULL);
int modelID = modelInq(instID, 0, "ECHAM5");
if ( modelID == -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