better fix to WINDNINJA_DATA related errors and warning messages, now even if WINDNINJA_DATA is set to a valid path, it only passes if the path contains WINDNINJA_DATA things

Author: latwood

src/ninja/ninja_init.cpp

@@ -300,7 +300,7 @@ int NinjaInitialize(const char* typeofrun)
     ** Set windninja data if it isn't set.
     */
     std::string wnDataPath = CPLGetConfigOption("WINDNINJA_DATA", "FALSE");
-    if( !CPLCheckForFile((char*)wnDataPath.c_str(), NULL) )
+    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;

src/ninja/ninjafoam.cpp

@@ -134,7 +134,7 @@ bool NinjaFoam::simulate_wind()
     CPLDebug("NINJAFOAM", CPLSPrintf("foamVersion = \"%s\"",foamVersion.c_str()));
 
     std::string pszWnDataPath = CPLGetConfigOption( "WINDNINJA_DATA", NULL );
-    if( !CPLCheckForFile((char*)pszWnDataPath.c_str(), NULL) )
+    if( !CPLCheckForFile((char*)CPLFormFilename(pszWnDataPath.c_str(),"tz_world.zip",NULL), NULL) )
     {
         throw std::runtime_error("invalid WINDNINJA_DATA path for ninjafoam.");
     }