Use nwm-ewts repository C Library

include/bmi_topmodel.h

@@ -16,7 +16,6 @@ int init_config(const char* config_file, topmodel_model* model);
 
 int read_init_config(const char* config_file, topmodel_model* model);
 
-
 #if defined(__cplusplus)
 }
 #endif

include/logger.h

@@ -1,21 +1,7 @@
-#ifndef LOGGER_H
-#define LOGGER_H
-
-#include <stdarg.h> // for variable args: va_list
-#include <stdbool.h>
-
-typedef enum {      
-    NONE = 0,
-    DEBUG = 1,
-    INFO = 2,
-    WARNING = 3,
-    SEVERE = 4,
-    FATAL = 5,
-} LogLevel;
-
-// Public Methods
-LogLevel GetLogLevel(void);
-bool IsLoggingEnabled(void);
-void Log(LogLevel messageLevel, const char* message, ...);
-
-#endif // LOGGER_H
+#ifndef TOPMODEL_LOGGER_H
+#define TOPMODEL_LOGGER_H
+#include "ewts/module_constants.h"
+#define EWTS_ID EWTS_ID_TOPMODEL
+#include "ewts/logger.h"
+#include "ewts/log_levels.h"
+#endif /* TOPMODEL_LOGGER_H */

src/bmi_topmodel.c

@@ -412,6 +412,13 @@ static int Initialize(Bmi *self, const char *cfg_file) {
     topmodel_model *topmodel;
     topmodel = (topmodel_model *)self->data;
 
+    // Initialize the Error, Warning and Trapping System
+#ifdef EWTS_HAVE_NGEN_BRIDGE    
+    EwtsInit(EWTS_ID_TOPMODEL, true);
+#else
+    EwtsInit(EWTS_ID_TOPMODEL, false);
+#endif    
+
     // Read and setup data from file
     int ret = init_config(cfg_file, topmodel);
     if (ret != BMI_SUCCESS)