Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor to allow halo > 0 decomposition of the mesh #20

Merged
merged 16 commits into from
Sep 4, 2024
+1,663 −417
Merged

Refactor to allow halo > 0 decomposition of the mesh #20

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
dc2b991
parent d9ff4d39ff3e7a420548a207fef60969c2bbf4f4
twsearle Jan 26, 2024
c23b680
Update to handle halos (#4)
s-good May 28, 2024
5a2ece6
Fixup errors in merge
twsearle May 28, 2024
1e8a009
tidy up white space
twsearle May 28, 2024
360547c
Updated logic (#5)
s-good Jun 10, 2024
d7ddbbe
Additional halo fixes
s-good Jun 20, 2024
99c92c8
remove comments LocalOrcaGrid.cc
twsearle Jul 4, 2024
8d0cdbc
remove diagnostics from OrcaMeshGenerator.cc
twsearle Jul 4, 2024
5941ada
remove diagnostics from test_orca_local_grid.cc
twsearle Jul 4, 2024
cb319a0
remove diagnostics from surroundingRectangle test
twsearle Jul 4, 2024
ac69d00
fix warning
wdeconinck Jul 26, 2024
6450583
no unsigned integers
wdeconinck Aug 5, 2024
d87a650
Fix normalisation
wdeconinck Aug 5, 2024
6509f04
ij indexing counts further into halo
wdeconinck Aug 5, 2024
f4f6350
Disable debugging output
wdeconinck Aug 5, 2024
18f3137
Disable tests for high res grids (ORCA025 and ORCA12)
wdeconinck Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/atlas-orca/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ ecbuild_add_library(
grid/OrcaGridBuilder.cc
meshgenerator/OrcaMeshGenerator.cc
meshgenerator/OrcaMeshGenerator.h
meshgenerator/SurroundingRectangle.cc
meshgenerator/SurroundingRectangle.h
meshgenerator/LocalOrcaGrid.cc
meshgenerator/LocalOrcaGrid.h
util/AtlasIOReader.h
util/ComputeCachedPath.h
util/ComputeUid.h
Expand Down
5 changes: 5 additions & 0 deletions src/atlas-orca/grid/Orca.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "atlas-orca/util/OrcaData.h"
#include "atlas-orca/util/OrcaDataFile.h"
#include "atlas-orca/util/OrcaPeriodicity.h"
#include "atlas-orca/util/PointIJ.h"


namespace atlas::grid::detail::grid {
Expand Down Expand Up @@ -83,6 +84,10 @@ gidx_t Orca::periodicIndex( idx_t i, idx_t j ) const {
return index( p.i - imin_, p.j - jmin_ );
}

orca::PointIJ Orca::periodicIJ( idx_t i, idx_t j ) const {
return periodicity_->compute( i + imin_, j + jmin_ );
}

Orca::Orca( const Config& config ) :
Orca( spec_name( config, spec_uid( config, config.getString( "name", "" ) ) ), config ) {}

Expand Down
3 changes: 2 additions & 1 deletion src/atlas-orca/grid/Orca.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "atlas/runtime/Exception.h"
#include "atlas/util/Config.h"
#include "atlas/util/Point.h"
#include "atlas-orca/util/PointIJ.h"

namespace atlas {
class Mesh;
Expand Down Expand Up @@ -165,7 +166,6 @@ class Orca final : public Grid {
/// Constructor taking a name/uid and a configuration (spec)
Orca( const std::string& name_or_uid, const Config& );

public:
idx_t size() const override;

Spec spec() const override;
Expand Down Expand Up @@ -196,6 +196,7 @@ class Orca final : public Grid {
bool invalidElement( idx_t i, idx_t j ) const { return invalid_element_[( imin_ + i ) + ( jmin_ + j ) * jstride_]; }

gidx_t periodicIndex( idx_t i, idx_t j ) const;
atlas::orca::PointIJ periodicIJ( idx_t i, idx_t j ) const;

void index2ij( gidx_t gidx, idx_t& i, idx_t& j ) const {
//gidx = jstride_ * (jmin_+j) + (imin_+i);
Expand Down
2 changes: 2 additions & 0 deletions src/atlas-orca/grid/OrcaGrid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include "Orca.h"
#include "atlas/grid/Grid.h"
#include "atlas-orca/util/PointIJ.h"


namespace atlas {
Expand Down Expand Up @@ -53,6 +54,7 @@ class OrcaGrid : public Grid {
int haloSouth() const { return grid_->haloSouth(); }

gidx_t periodicIndex( idx_t i, idx_t j ) const { return grid_->periodicIndex( i, j ); }
orca::PointIJ periodicIJ( idx_t i, idx_t j ) const { return grid_->periodicIJ( i, j ); }

void index2ij( gidx_t gidx, idx_t& i, idx_t& j ) const { grid_->index2ij( gidx, i, j ); }

Expand Down
Loading