Trygve
/
contour-creator
mirror of https://gitlab.com/Trygve/contour-creator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempted parallelization of casemaps

This commit is contained in:
esther 2024-04-17 11:34:54 +02:00
parent 40d41fc065
commit cf72fbfefa
1 changed files with 169 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

314
src/main.cpp
View File

@ -1,146 +1,170 @@
#include "HeightMap.hh" #include "HeightMap.hh"
#include "CaseMap.hh" #include "CaseMap.hh"
#include <gdal/ogr_api.h> #include <gdal/ogr_api.h>
#include "ogrsf_frmts.h" #include "ogrsf_frmts.h"
#include <iostream> #include <iostream>
#include <ostream> #include <ostream>
#include <vector> #include <vector>
#include <cstdint> #include <cstdint>
#include <gdal/gdal.h> #include <gdal/gdal.h>
#include "gdal/gdal_priv.h" #include "gdal/gdal_priv.h"
#include <gdal/gdal_frmts.h> #include <gdal/gdal_frmts.h>
#include <omp.h>
CaseMap produce_casemap(HeightMap* heightmap, float z)
{ CaseMap produce_casemap(HeightMap* heightmap, float z)
int length = (heightmap->width-1)*(heightmap->height-1); {
uint8_t *cases = (uint8_t *) CPLMalloc(sizeof(uint8_t)*length); int length = (heightmap->width-1)*(heightmap->height-1);
for (int i = 0; i<length; i++) { uint8_t *cases = (uint8_t *) CPLMalloc(sizeof(uint8_t)*length);
int y = i/(heightmap->width-1); for (int i = 0; i<length; i++) {
int x = i%(heightmap->width-1); int y = i/(heightmap->width-1);
uint8_t result = (heightmap->get_pixel(x,y)>z) + int x = i%(heightmap->width-1);
(heightmap->get_pixel(x+1,y)>z)*2 + uint8_t result = (heightmap->get_pixel(x,y)>z) +
(heightmap->get_pixel(x+1,y+1)>z)*4 + (heightmap->get_pixel(x+1,y)>z)*2 +
(heightmap->get_pixel(x,y+1)>z)*8; (heightmap->get_pixel(x+1,y+1)>z)*4 +
*(cases + i) = result; (heightmap->get_pixel(x,y+1)>z)*8;
} *(cases + i) = result;
}
return CaseMap(heightmap->width-1, heightmap->height-1, cases, heightmap->reference_system);
return CaseMap(heightmap->width-1, heightmap->height-1, cases, heightmap->reference_system);
}
}
void write_output_file(CaseMap* casemap, const char *filepath)
{ std::vector<CaseMap> vector_casemap(HeightMap* heightmap, int interval)
{
const char *pszDriverName = "ESRI Shapefile"; int num_contours = (heightmap->max - heightmap->min)/interval;
GDALDriver *poDriver; std::vector<CaseMap> vector_contours;
omp_set_num_threads(8);
GDALAllRegister();
#pragma omp parallel
poDriver = GetGDALDriverManager()->GetDriverByName(pszDriverName ); {
if( poDriver == NULL ) std::vector<CaseMap> vec_private;
{ #pragma omp for
printf( "%s driver not available.\n", pszDriverName ); for (int i = 1; i <= num_contours; i++)
exit( 1 ); {
} vec_private.push_back(produce_casemap(heightmap, heightmap->min + interval*i));
std::cout << "Execute thread " << omp_get_num_threads << " ";
GDALDataset *poDS; }
#pragma omp critical
poDS = poDriver->Create( filepath, 0, 0, 0, GDT_Unknown, NULL ); vector_contours.insert(vector_contours.end(), vec_private.begin(), vec_private.end());
if( poDS == NULL )
{ }
printf( "Creation of output file failed.\n" ); return vector_contours;
exit( 1 ); }
}
void write_output_file(CaseMap* casemap, const char *filepath)
OGRLayer *poLayer; {
poLayer = poDS->CreateLayer( "contours", &casemap->reference_system, wkbPoint, NULL ); const char *pszDriverName = "ESRI Shapefile";
if( poLayer == NULL ) GDALDriver *poDriver;
{
printf( "Layer creation failed.\n" ); GDALAllRegister();
exit( 1 );
} poDriver = GetGDALDriverManager()->GetDriverByName(pszDriverName );
if( poDriver == NULL )
OGRFieldDefn oField( "Name", OFTString ); {
printf( "%s driver not available.\n", pszDriverName );
oField.SetWidth(32); exit( 1 );
}
if( poLayer->CreateField( &oField ) != OGRERR_NONE )
{ GDALDataset *poDS;
printf( "Creating Name field failed.\n" );
exit( 1 ); poDS = poDriver->Create( filepath, 0, 0, 0, GDT_Unknown, NULL );
} if( poDS == NULL )
{
for (int i = 0; i<casemap->height*casemap->width; i++) { printf( "Creation of output file failed.\n" );
if (*(casemap->cases + i) != 0 && *(casemap->cases + i) != 15) exit( 1 );
{ }
int x_int = i%casemap->width;
int y_int = casemap->height*casemap->width - i/casemap->width; OGRLayer *poLayer;
double x = double(x_int);
double y = double(y_int); poLayer = poDS->CreateLayer( "contours", &casemap->reference_system, wkbPoint, NULL );
if( poLayer == NULL )
OGRFeature *poFeature; {
printf( "Layer creation failed.\n" );
poFeature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() ); exit( 1 );
poFeature->SetField( "Name", *(casemap->cases + i) ); }
//OGRSpatialReference local; OGRFieldDefn oField( "Name", OFTString );
//auto poCT = OGRCreateCoordinateTransformation( &local, &casemap->reference_system ); oField.SetWidth(32);
/* if( poLayer->CreateField( &oField ) != OGRERR_NONE )
if( poCT == NULL || !poCT->Transform( 1, &x, &y ) ) {
printf( "Transformation failed.\n" ); printf( "Creating Name field failed.\n" );
*/ exit( 1 );
OGRPoint pt; }
pt.setX( x );
pt.setY( y ); for (int i = 0; i<casemap->height*casemap->width; i++) {
if (*(casemap->cases + i) != 0 && *(casemap->cases + i) != 15)
poFeature->SetGeometry( &pt ); {
int x_int = i%casemap->width;
if( poLayer->CreateFeature( poFeature ) != OGRERR_NONE ) int y_int = casemap->height*casemap->width - i/casemap->width;
{ double x = double(x_int);
printf( "Failed to create feature in shapefile.\n" ); double y = double(y_int);
exit( 1 );
} OGRFeature *poFeature;
OGRFeature::DestroyFeature( poFeature ); poFeature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() );
} poFeature->SetField( "Name", *(casemap->cases + i) );
}
//OGRSpatialReference local;
GDALClose( poDS );
/* //auto poCT = OGRCreateCoordinateTransformation( &local, &casemap->reference_system );
OGRDataSourceH datasource = OGR_Dr_CreateDataSource(OGRGetDriverByName("GeoJSON"), "contour.geojson", new char*);
OGRSpatialReference reference_system = casemap->reference_system; /*
OGRLayerH layer = OGR_DS_CreateLayer(datasource, "contour", &reference_system, wkbLineString25D, new char*); if( poCT == NULL || !poCT->Transform( 1, &x, &y ) )
printf( "Transformation failed.\n" );
auto feature = OGR_F_Create(OGR_L_GetLayerDefn(static_cast<OGRLayerH>(layer))); */
OGRPoint pt;
OGRGeometryH geometry = OGR_G_CreateGeometry(wkbLineString25D); pt.setX( x );
*/ pt.setY( y );
}
poFeature->SetGeometry( &pt );
int main(int argc, const char* argv[])
{ if( poLayer->CreateFeature( poFeature ) != OGRERR_NONE )
const char* filepath = argv[1]; {
HeightMap map(filepath); printf( "Failed to create feature in shapefile.\n" );
exit( 1 );
std::cout << "x: " << map.width << " y: " << map.height << "\n"; }
std::cout << "max: " << map.max << " min: " << map.min << "\n";
OGRFeature::DestroyFeature( poFeature );
auto casemap = produce_casemap(&map, 40); }
/* }
for (int y = 0; y < casemap.height; y++)
{ GDALClose( poDS );
for (int x = 0; x < casemap.width; x++) /*
{ OGRDataSourceH datasource = OGR_Dr_CreateDataSource(OGRGetDriverByName("GeoJSON"), "contour.geojson", new char*);
if (casemap.get_case(x, y) && casemap.get_case(x, y)!=15) { OGRSpatialReference reference_system = casemap->reference_system;
std::cout << x << ","<< y << "=" << casemap.get_case(x, y) << " "; OGRLayerH layer = OGR_DS_CreateLayer(datasource, "contour", &reference_system, wkbLineString25D, new char*);
}
} auto feature = OGR_F_Create(OGR_L_GetLayerDefn(static_cast<OGRLayerH>(layer)));
//std::cout << "\n";
} OGRGeometryH geometry = OGR_G_CreateGeometry(wkbLineString25D);
*/ */
write_output_file(&casemap, "out.shp"); }
int main(int argc, const char* argv[])
{
const char* filepath = argv[1];
HeightMap map(filepath);
std::cout << "x: " << map.width << " y: " << map.height << "\n";
std::cout << "max: " << map.max << " min: " << map.min << "\n";
auto casemap = produce_casemap(&map, 40);
/*
for (int y = 0; y < casemap.height; y++)
{
for (int x = 0; x < casemap.width; x++)
{
if (casemap.get_case(x, y) && casemap.get_case(x, y)!=15) {
std::cout << x << ","<< y << "=" << casemap.get_case(x, y) << " ";
}
}
//std::cout << "\n";
}
*/
write_output_file(&casemap, "out.shp");
vector_casemap(&map, 1);
} }