Merge pull request #590 from firelab/improve-WINDNINJA_DATA-warnings

Improvement to WINDNINJA_DATA warnings and error messages

tested, and the code doesn't break windows builds

Author: latwood

src/ninja/ninja_init.cpp

@@ -299,11 +299,19 @@ int NinjaInitialize(const char* typeofrun)
     /*
     ** Set windninja data if it isn't set.
     */
-    if (!CSLTestBoolean(CPLGetConfigOption("WINDNINJA_DATA", "FALSE"))) {
+    std::string wnDataPath = CPLGetConfigOption("WINDNINJA_DATA", "FALSE");
+    if( !CPLCheckForFile((char*)CPLFormFilename(wnDataPath.c_str(),"tz_world.zip",NULL), NULL) )
+    {
+        CPLDebug( "WINDNINJA", "WINDNINJA_DATA \"%s\" is not valid, attempting to find valid WINDNINJA_DATA", wnDataPath.c_str() );
         std::string osDataPath;
         osDataPath = FindDataPath("tz_world.zip");
-        if (osDataPath != "") {
+        if (osDataPath != "")
+        {
+            CPLDebug( "WINDNINJA", "found WINDNINJA_DATA \"%s\"", CPLGetPath(osDataPath.c_str()) );
             CPLSetConfigOption("WINDNINJA_DATA", CPLGetPath(osDataPath.c_str()));
+        } else
+        {
+            throw std::runtime_error("no valid WINDNINJA_DATA found, please set valid WINDNINJA_DATA");
         }
     }
 

src/ninja/ninjafoam.cpp

@@ -132,7 +132,13 @@ bool NinjaFoam::simulate_wind()
     foamVersion = CPLGetConfigOption("WM_PROJECT_VERSION", "");
     #endif
     CPLDebug("NINJAFOAM", CPLSPrintf("foamVersion = \"%s\"",foamVersion.c_str()));
-    
+
+    std::string pszWnDataPath = CPLGetConfigOption( "WINDNINJA_DATA", NULL );
+    if( !CPLCheckForFile((char*)CPLFormFilename(pszWnDataPath.c_str(),"tz_world.zip",NULL), NULL) )
+    {
+        throw std::runtime_error("invalid WINDNINJA_DATA path for ninjafoam.");
+    }
+
     if(CSLTestBoolean(CPLGetConfigOption("WRITE_TURBULENCE", "FALSE")))
     {
         CPLDebug("NINJAFOAM", "Writing turbulence output...");