Automatically populate default model entries.

src/model.c

@@ -29,7 +29,6 @@ model_t;
 
 
 static int  MODEL_Debug = 0;   /* If set to 1, debugging */
-static int * modelInitializedNsp;
 
 static void modelInit(void);
 
@@ -77,7 +76,6 @@ model_t *modelNewEntry ( void )
 
 int modelDef(int instID, int modelgribID, const char *name);
 
-static
 void modelDefaultEntries ( void )
 {
   int instID, i;
@@ -112,37 +110,16 @@ void modelDefaultEntries ( void )
     reshSetStatus(resH[i], &modelOps, RESH_PRE_ASSIGNED);
 }
 
-static
-void modelFinalize ( void )
-{
-  free (   modelInitializedNsp );
-}
-
 static
 void modelInit(void)
 {
   static int modelInitialized = 0;
-  int nsp, nspc;
-  char *env;
-
-  nspc = namespaceGetNumber ();
-
-  if ( !modelInitialized )
-    {
-      modelInitialized = 1;
-      modelInitializedNsp = (int*) xcalloc ( 1, nspc * sizeof ( int ));
-      atexit ( modelFinalize );
-      env = getenv("MODEL_DEBUG");
-      if ( env ) MODEL_Debug = atoi(env);
-    }
-
-  nsp = namespaceGetActive ();
-
-  if ( modelInitializedNsp[nsp] ) return;
 
-  modelInitializedNsp[nsp] = 1;
+  if (modelInitialized) return;
 
-  modelDefaultEntries ();
+  modelInitialized = 1;
+  char *env = getenv("MODEL_DEBUG");
+  if ( env ) MODEL_Debug = atoi(env);
 }
 
 int modelSize ( void )

src/model.h

@@ -5,6 +5,8 @@ int
 modelUnpack(void *buf, int size, int *position,
             int, void *context);
 
+void modelDefaultEntries(void);
+
 #endif
 /*
  * Local Variables:

src/resource_handle.c

@@ -18,6 +18,7 @@
 #include "file.h"
 #include "resource_unpack.h"
 #include "institution.h"
+#include "model.h"
 
 enum { MIN_LIST_SIZE = 128 };
 
@@ -98,6 +99,7 @@ listInitResources(int nsp)
   int oldNsp = namespaceGetActive();
   namespaceSetActive(nsp);
   instituteDefaultEntries();
+  modelDefaultEntries();
   namespaceSetActive(oldNsp);
 }