-
Notifications
You must be signed in to change notification settings - Fork 42
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.
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
Add extended cubed-sphere dual halo with a correct alpha-beta projection. #95
Add extended cubed-sphere dual halo with a correct alpha-beta projection. #95
Conversation
Codecov Report
@@ Coverage Diff @@
## develop #95 +/- ##
===========================================
+ Coverage 77.94% 78.01% +0.06%
===========================================
Files 773 773
Lines 52917 53094 +177
===========================================
+ Hits 41245 41419 +174
- Misses 11672 11675 +3
Continue to review full report at Codecov.
|
* develop: Apply clang-format Removed rank restriction in redistribution. Update Changelog Version 0.28.0 ATLAS-344 Fix ConvexSphericalPolygon::compute_radius() ATLAS-344 Remove part of test_convexsphericalpolygon ATLAS-344 Use EPS and TOL in ConvexSphericalPolygon where possible
* develop: Move Projection::Jacobian to namespace
Looking good! Thanks for this @odlomax . |
Thanks for taking the time to give it a look, @wdeconinck 😀 |
All merged in develop with commit 8133262 |
* develop: Fix bug where using ectrans was not enabling adjoint of invtrans Version 0.28.1 Fix ambiguous call to std::min Fix ambiguous call to std::min Fix bilinear remapping (ecmwf#85): Catch periodicity issues using 3D kdtree (ecmwf#96) Add extended cubed-sphere dual halo with a correct alpha-beta projection (ecmwf#95) Move Projection::Jacobian to namespace Apply clang-format Removed rank restriction in redistribution.
Capable to interpolate from any grid to any grid Squashed commit of the following: commit 2bbc9fa5f05ab5fe19792aaf8454c0688d18fe2d Author: Willem Deconinck <[email protected]> Date: Thu May 19 10:48:43 2022 +0100 Relax tolerances, for nvhpc with Github Actions commit f3b4c9ad04d0738d71e1f001b0831c8cb50d1ec8 Author: Willem Deconinck <[email protected]> Date: Wed May 18 16:59:00 2022 +0100 Cosmetic fixes commit bce3d39ef6d9e9860de3e9011e07f8dc9cc87b34 Author: Willem Deconinck <[email protected]> Date: Tue May 17 02:07:46 2022 +0100 Revamp atlas-conservative-interpolation sandbox commit 7daaaf69c30fe414b72c803f9374160d2bf79b08 Author: Willem Deconinck <[email protected]> Date: Tue May 17 21:41:51 2022 +0100 Improve ConservativeSphericalPolygonInterpolation metadata and configuration commit 7e136ed7f110103e0c23429e4cafef3eda70a7bb Author: Willem Deconinck <[email protected]> Date: Tue May 17 02:06:25 2022 +0100 Fix ConservativeSphericalPolygonInterpolation with functionspace API commit 144d6cc25b2c0bd0f950fe2061a96aac7d3e62c7 Author: Willem Deconinck <[email protected]> Date: Thu May 19 09:32:28 2022 +0100 Fix memory problem with accuracy computation commit 4e4396dad21523d37025c4d6d330ea3250f2fa9f Merge: 03646d314 b68da09fc Author: Willem Deconinck <[email protected]> Date: Thu May 19 10:18:54 2022 +0100 Merge branch 'develop' into features/conservative_remap * develop: (58 commits) Fix AddressSanitizer issues Only compile Fortran sandbox programs when HAVE_FORTRAN Fix CubedSphereInterpolation bug and CubedSphereProjection bug (#104) Fix more ConvexSphericalPolygon intersection edge cases Add output operator for Interpolation Make Grid::type() public ATLAS-361 Add SphericalHarmonic function ATLAS-358 Support degenerate pentagon in FiniteElement interpolation ATLAS-358 Pentagon element type ATLAS-352 HEALPix mesh with '3d' option, corresponding to original healpix numbering Small fixes and diagnostics in sandbox atlas-parallel-interpolation ATLAS-350 Fix bug in healpix global numbering of periodic cells and nodes (tnx Willem) Fix in atlas-meshgen where --3d option was not properly propagated to mesh generators Fix type of indices in test_transgeneral CASE test_2level_adjoint_test_with_powerspectrum_convolution Fix clang-tidy warning Add Fortran API for FieldSet::name() ATLAS-357 StructuredColumns functionspace now works for regional grids atlas::vector::capacity() ATLAS-350 Fix global numbering of cells matching HEALPix grid Add Fortran API for Interpolation::execute_adjoint() ... commit 03646d314e56675cf0f8abe7f316b83d5708a25a Author: Willem Deconinck <[email protected]> Date: Wed Apr 6 17:00:13 2022 +0100 Remove unnecessary code commit 74eb0b475e2424abd3efab35d134b217a1f27c82 Author: Willem Deconinck <[email protected]> Date: Thu Mar 24 09:50:22 2022 +0000 Use MatrixCache with a (probably too simple) uid to distinguish first and second order matrix in ConservativeSphericalPolygonInterpolation commit 9e4f8f2d8cf28508553158351ae6fc68ee08607f Merge: a805e3730 2c8ba8332 Author: Willem Deconinck <[email protected]> Date: Thu Mar 24 10:33:18 2022 +0000 Merge branch 'develop' into features/conservative_remap [DOES NOT COMPILE] * develop: Make interpolation::Method::matrix_ members private and add protected accessor functions Add uid to interpolation::MatrixCache File reorganisation: fe/FiniteElement -> unstructured/FiniteElement Rename BilinearRemapping to UnstructuredBilinearLonLat commit a805e37303229138403db9d0c209b7809cbdea77 Author: Willem Deconinck <[email protected]> Date: Wed Mar 23 17:23:35 2022 +0000 Review part 9: Cleanups and Rename ConservativeMethod to ConservativeSphericalPolygonInterpolation commit 23a4215d7400bc4095e51576757954599d8b0801 Author: Willem Deconinck <[email protected]> Date: Wed Mar 23 12:58:06 2022 +0000 Review part 8: Simple method to fix bug in duplicated triplets at cost of some performance commit 330a982beda272e30a1ecf7070f51422aadead07 Author: Willem Deconinck <[email protected]> Date: Wed Mar 23 11:49:03 2022 +0000 Review part 7: Remove set_order() and add printing of interpolation commit 7596bba0ac4cd9676e24d5215e958970d19fde80 Author: Pedro Maciel <[email protected]> Date: Wed Mar 23 09:57:57 2022 +0000 ConservativeMethod simpler sort (same thing) commit c0f04a13c01bd8c0465fc6feaba3a6b7fb07284b Author: Willem Deconinck <[email protected]> Date: Wed Mar 23 09:52:11 2022 +0000 Minor cleanup commit c74632dbc9f29a755f5f51f36a64373542062fe6 Author: Willem Deconinck <[email protected]> Date: Tue Mar 22 19:37:33 2022 +0000 Review part 6: Remove RemapStat::compute and add some contribution to do_execute commit e79aac53ca1ad44529a5d30abd046a7a9d1e0863 Author: Willem Deconinck <[email protected]> Date: Tue Mar 22 15:54:33 2022 +0000 Review part 5: Don't require call to setup_stat commit 7b7889e9ab27b096b8883ab6c9661fa9c76fe15e Author: Willem Deconinck <[email protected]> Date: Tue Mar 22 15:45:17 2022 +0000 Review part 4: Use Metadata to pass RemapStat commit d48d686b256da42c034ff3cea46d701f42280b67 Merge: 5d07c600b c1e77945d Author: Willem Deconinck <[email protected]> Date: Tue Mar 22 14:09:32 2022 +0000 Merge branch 'develop' into features/conservative_remap * develop: Add Metadata return value to Interpolation::execute() Add interpolation::Cache constructor with filter, and apply it to interpolation::MatrixCache and interpolation::IndexKDTreeCache commit 5d07c600bbfefd9b0fc27d405a6b7b0f40cbf109 Author: Willem Deconinck <[email protected]> Date: Tue Mar 22 13:11:41 2022 +0000 Review part 3: Also cache function spaces and add more tests commit 051ec3d1dc6499fa12f93ca55d50467ea92a7336 Author: Willem Deconinck <[email protected]> Date: Mon Mar 21 20:13:20 2022 +0000 Review part 2: Reuse cachable data, and correct virtual functions override commit f50451b19b089e7fb36d9baa993fcc07a506fdb2 Author: Willem Deconinck <[email protected]> Date: Mon Mar 21 12:22:39 2022 +0000 Review part 1: Introduce cachable data. It cannot be reused yet. commit c5da7070e580de2260ffb1bcc58d166572795d74 Author: Willem Deconinck <[email protected]> Date: Fri Mar 18 11:57:40 2022 +0000 apply clang-format commit fefc05daff68c6841f47ba023f0349d3a509e5cb Merge: 41f387ce9 2eed5368b Author: Willem Deconinck <[email protected]> Date: Fri Mar 18 11:56:58 2022 +0000 Merge branch 'develop' into features/conservative_remap * develop: Fix bug where using ectrans was not enabling adjoint of invtrans Version 0.28.1 Fix ambiguous call to std::min Fix ambiguous call to std::min Fix bilinear remapping (#85): Catch periodicity issues using 3D kdtree (#96) Add extended cubed-sphere dual halo with a correct alpha-beta projection (#95) Move Projection::Jacobian to namespace Apply clang-format Removed rank restriction in redistribution. commit 41f387ce9046be6a871bf53c9dc52e46fa9ad9c9 Author: Slavko Brdar <[email protected]> Date: Tue Mar 15 17:29:23 2022 +0000 try fixing other compilers in unit test for convexsphericalpolygon commit 62ea32c49935430ad41f9e627bd5e23d192b132b Author: Slavko Brdar <[email protected]> Date: Tue Mar 15 16:34:31 2022 +0000 fix problematic polygon intersection in CS-LFR-256-->H1280 commit 44025be7f71ce889697ff5772c11e49550ab015e Author: Slavko Brdar <[email protected]> Date: Tue Mar 15 16:27:27 2022 +0000 add unit test for polygon intersections for problematic CS-LFR-256-->H1280 remapping commit b2c4d4cf951237efc13afa2acec506c8a54e7234 Author: Slavko Brdar <[email protected]> Date: Tue Mar 15 15:34:28 2022 +0000 fix polygon intersection problem with CS-LFR-16->O32 and add a unit test for it commit 1a541e74a3119e051c732ac5fb63ef6138bc5dc9 Author: Slavko Brdar <[email protected]> Date: Tue Mar 15 13:50:51 2022 +0000 add unit test for polygon intersection problem from CS-LFR-16 -> O32 commit 46011f8fbecbbd4342f7f188bb4d07b9baa74c37 Author: Slavko Brdar <[email protected]> Date: Tue Mar 15 13:40:20 2022 +0000 warn about target and source cell intersections not summing up to their host source and target cells, tolerance for now is at 0.1 % mismatch commit cde3c31df4340750ab066177933e2999f0616729 Author: Slavko Brdar <[email protected]> Date: Tue Mar 15 01:20:07 2022 +0000 fix in analysis output of conservative remapping commit f1cda6c1419047b615b64c67112eae557e2887da Author: Slavko Brdar <[email protected]> Date: Tue Mar 15 01:02:41 2022 +0000 fix debuggin in conservative remapping: 1) use PLG_DEBUG instead of NDEBUG; 2) fix a bug in computing tgt_cell coverage commit fa9d82cd1afe47b1e4436968d726b46e1e355492 Merge: cfcc3ec28 5189664eb Author: Slavko Brdar <[email protected]> Date: Mon Mar 14 18:49:05 2022 +0000 Merge branch 'features/conservative_remap' of ssh://git.ecmwf.int/atlas/atlas into features/conservative_remap commit cfcc3ec28a9bc1bbfcd00b82c9a571c6e2bbba23 Author: Slavko Brdar <[email protected]> Date: Mon Mar 14 18:48:59 2022 +0000 add analysis for detection of target cells not fully covered its intersections commit 9c74896fd7d3e0a65760ba5b4910366b891ba813 Author: Slavko Brdar <[email protected]> Date: Mon Mar 14 17:28:03 2022 +0000 improve debugging in polygon intersection commit 5189664ebf6e22a15eae3d461f55d568628dc3a7 Author: Willem Deconinck <[email protected]> Date: Mon Mar 14 11:01:41 2022 +0000 Fix "8af432f18 - fix bug in CS-LFR-2->O48 remapping" differently commit b134080ea5e42a1ee4bdafeb2e84ba26199c3078 Author: Slavko Brdar <[email protected]> Date: Fri Mar 11 12:34:24 2022 +0000 try fixing conservative remap unit test for nvhpc compiler commit 8543d05d97450c3213f8b6b97f8488485eb2f8f6 Author: Slavko Brdar <[email protected]> Date: Fri Mar 11 12:16:33 2022 +0000 remove unnecessary variable commit 36323202e6e9ebd3da8b46ee969a4fa1ce4a0459 Author: Slavko Brdar <[email protected]> Date: Thu Mar 10 17:18:58 2022 +0000 code readability: replace weights->src_weights, sweights->tgt_weights commit bc8f5efcf9ca3df064f7c86640074b4531365e1b Author: Slavko Brdar <[email protected]> Date: Thu Mar 10 17:08:05 2022 +0000 add area check on intersection polygon commit 8af432f186881a966e755122ea662f00ba3c2f33 Author: Slavko Brdar <[email protected]> Date: Thu Mar 10 16:25:25 2022 +0000 fix bug in CS-LFR-2->O48 remapping commit 690ba8d48916af29a8cccf03369e111189329444 Merge: 5d57ba9de c2789a992 Author: Slavko Brdar <[email protected]> Date: Thu Mar 10 14:49:14 2022 +0000 Merge branch 'features/conservative_remap' of ssh://git.ecmwf.int/atlas/atlas into features/conservative_remap commit 5d57ba9de4e63882c6a040a938cc777ce3cdb07c Author: Slavko Brdar <[email protected]> Date: Thu Mar 10 14:46:41 2022 +0000 in polygon intersection, empty polygons are equal commit 9e6c828e4c9dbd402d191e15e2963dfa281f5df5 Author: Slavko Brdar <[email protected]> Date: Thu Mar 10 13:59:20 2022 +0000 add problematic CS-LFR-2 -> O48 remapping polygons to unit tests commit c2789a9922dd21f10dc3c882cb1cd25f1ae9f795 Author: Willem Deconinck <[email protected]> Date: Thu Mar 10 09:30:34 2022 +0000 Fix compiler warning commit c200d2b64342b7ced830478859789e60d1f469b5 Author: Slavko Brdar <[email protected]> Date: Wed Mar 9 16:50:01 2022 +0000 fix for parallel boundary problem, fix for CubedSphere issues (together with Willem) commit bf60601fd7c5345a24d2e96fb8ede69933020763 Author: Slavko Brdar <[email protected]> Date: Tue Mar 8 11:01:14 2022 +0000 correct setting of the halo size for CubedSphere meshes commit 305916ccf5298778bfc070ac3742f2f912018261 Merge: e52804934 3901c057c Author: Slavko Brdar <[email protected]> Date: Wed Mar 2 16:42:59 2022 +0000 Merge branch 'develop' into features/conservative_remap commit e5280493444dfc7b2c21e02674cab69425a6f22f Author: Slavko Brdar <[email protected]> Date: Wed Mar 2 16:40:15 2022 +0000 remove building of obsolete unit test -spherical_geo- commit ed1c3e0934ba04e42db15f506d1bb8d131c84922 Author: Slavko Brdar <[email protected]> Date: Wed Mar 2 14:09:24 2022 +0000 -spherical_geo- unit test has been replaced with -convexsphericalpolygon- commit 11d9634817189ea68ecbc674facd42b7a0575b07 Merge: 7bd9fa7c2 bfced3fcc Author: Slavko Brdar <[email protected]> Date: Mon Feb 28 18:10:51 2022 +0000 Merge branch 'develop' into features/conservative_remap, and add inside_vertices for debugging polygon intersections commit 7bd9fa7c2abee2cc865d2dd187b46e5a35534060 Author: Slavko Brdar <[email protected]> Date: Mon Feb 28 13:49:25 2022 +0000 bugfix for tgt-cell-data=0, index -inode- overshoots commit a0a5701b17229093082ab8f34ddb39e89496ba2b Author: Slavko Brdar <[email protected]> Date: Mon Feb 28 13:47:09 2022 +0000 bugfix in remap_stat commit 7782362248c591fe508b6d54621b8618f144379c Author: Slavko Brdar <[email protected]> Date: Mon Feb 28 13:46:04 2022 +0000 also fix the new intersection unit test w.r.t. constexpr compilation problem commit 2a897b5132815763feb7239be6e3cf25edf8f4f1 Author: Slavko Brdar <[email protected]> Date: Mon Feb 28 13:45:00 2022 +0000 do not use deprecated function; 2) fix compilation issue with static constexpr (tnx Willem) commit 31e8bce911e2f846dbc6bd17b94a9c046d0ebfa1 Author: Slavko Brdar <[email protected]> Date: Wed Feb 23 16:57:07 2022 +0000 improve debbuging by using does_intersect method to check for bad polygon intersections commit 43ec7ab6cf240c1c00650ae16625f74beda5ea6f Author: Slavko Brdar <[email protected]> Date: Wed Feb 23 16:20:43 2022 +0000 change intersection unit test for ConvexSphericalPolygon to work with with 3d point and away from spherical coordinates commit 30b832b1b0ae7a196cb04ac19783e557213cfd93 Author: Slavko Brdar <[email protected]> Date: Wed Feb 23 16:20:30 2022 +0000 use constant EPS and TOL in ConvexSphericalPolygon instead of individually set thresholds commit 5d0d59727508d8203289db911f65585886071161 Author: Slavko Brdar <[email protected]> Date: Fri Feb 18 17:20:43 2022 +0000 fix unit test for cray, nvhpc, pgi commit 1332749dccd4af7f3ba546db53a68733ef01c0de Author: Slavko Brdar <[email protected]> Date: Fri Feb 18 16:17:01 2022 +0000 fix bug in NodeColumn indexing of subpolygons and revamp the code of subpolygon creation commit a63b4d73280ff65b079619d0c2ea46c489029624 Author: Slavko Brdar <[email protected]> Date: Fri Feb 18 15:05:26 2022 +0000 code cleanup commit 3cc41110a7882e9a88dd9532b38b661a28288149 Author: Slavko Brdar <[email protected]> Date: Fri Feb 18 13:18:28 2022 +0000 simplify initialisation of src_field in unit test commit 3857246d0eeae5aff3f060da78aefcb67d18d7ee Author: Slavko Brdar <[email protected]> Date: Fri Feb 18 11:22:49 2022 +0000 improve output from unit-test commit a6b85c6ef9f3223bbea35aa8481495e93f11aa50 Author: Slavko Brdar <[email protected]> Date: Fri Feb 18 11:03:19 2022 +0000 adjust tolerances to pass unit-test on Cray & co commit c7c0ef7be6b6f8ba041b16dd00c06b5578e42ac2 Merge: 7ac1929ab a2a53f02c Author: Slavko Brdar <[email protected]> Date: Fri Feb 18 00:53:23 2022 +0000 Merge branch 'develop' into features/conservative_remap commit 7ac1929ab1a5a24e3d8d12b126d530988ebe8707 Author: Slavko Brdar <[email protected]> Date: Fri Feb 18 00:50:20 2022 +0000 fix errors in std output commit f02d8bfdc1464c06d2545f94a1cb31ed1e60dac4 Author: Slavko Brdar <[email protected]> Date: Fri Feb 18 00:04:30 2022 +0000 encapsulate remapping statistics in RemapStat commit d715ccb0afc633f5988811c7eaed69d123ce0e42 Author: Slavko Brdar <[email protected]> Date: Thu Feb 17 17:13:46 2022 +0000 make unit test of cons remap pass commit 19a68fb5800126caba8f53b1694b1fbfd034c29d Author: Slavko Brdar <[email protected]> Date: Thu Feb 17 16:41:13 2022 +0000 improve unit test for conservative remapping commit 7d76021e189343e3e70f59eb63f674c34281912f Author: Slavko Brdar <[email protected]> Date: Thu Feb 17 14:53:56 2022 +0000 add RemapStat subclass of ConservativeMethod to collect statistics of the last remapping commit cd866d9e176e0fb0ab06798423b59034abe0d89d Author: Slavko Brdar <[email protected]> Date: Thu Feb 17 13:16:24 2022 +0000 move member definition to .cc commit 4f1c2cda77e0e7dc9a914c57eb451f038c6f397a Author: Slavko Brdar <[email protected]> Date: Wed Feb 16 15:08:36 2022 +0000 clean up unit test for conservative remapping - atlas excepts still missing commit a8a9281ff92d9a7ca38c608933a764f8a0b055af Author: Slavko Brdar <[email protected]> Date: Wed Feb 16 13:42:20 2022 +0000 add conservative interpolation tests in sandbox commit a008d41c6719171271b3b23b091de7516dac4522 Author: Willem Deconinck <[email protected]> Date: Wed Feb 16 11:57:22 2022 +0000 nb_points are retrieved from functionspace rather than from mesh commit 820268ddab5b44f680ae9dc34c7e244e2e5caa95 Merge: dc0dee0b4 1f59e67c2 Author: Willem Deconinck <[email protected]> Date: Wed Feb 16 11:39:26 2022 +0000 Merge branch 'develop' into features/conservative_remap * develop: ATLAS-346 Fix CellColumns::haloExchange for multiple element types Add += and -= operators to IndexView elements commit dc0dee0b4f6cd3e5d51d09f915b161171611d343 Author: Slavko Brdar <[email protected]> Date: Mon Feb 14 23:44:13 2022 +0000 add unit test to check node-to-cell connectivities of Atlas grids - Healpix grid fails vim test_mesh_node2cell.cc commit 962271cc82db6e74a3710413ffdee5e3385faedb Author: Slavko Brdar <[email protected]> Date: Mon Feb 14 16:27:08 2022 +0000 skip neighbourhood check for the periodic points for now - potentially a problem commit c7e3181116c073f20e4be30d73edd5688d389ec8 Author: Slavko Brdar <[email protected]> Date: Mon Feb 14 14:58:48 2022 +0000 fix an issue in NodeColumns with nodes which have no subpolygon associated with commit 3bdb0ae5afde75c17278155fa3eba4e62d047366 Author: Slavko Brdar <[email protected]> Date: Mon Feb 14 14:13:23 2022 +0000 make compile again commit 736d3bf038a55025cd39b1318d66da2694f94a66 Merge: b30b86de6 7afd801ac Author: Slavko Brdar <[email protected]> Date: Mon Feb 14 14:05:35 2022 +0000 Merge branch 'develop' into features/conservative_remap commit b30b86de6fadd6402193377bd9f8834b6ac458a4 Author: Slavko Brdar <[email protected]> Date: Mon Feb 14 11:51:06 2022 +0000 two assertion in unit test commit cac25e92d6cc07ec62792ba9ba3b15f017a0bc4d Author: Slavko Brdar <[email protected]> Date: Fri Feb 11 17:58:57 2022 +0000 enable matrix-free conservative remapping again commit ab982af441839e2ec670ac97409f418192bfddae Author: Slavko Brdar <[email protected]> Date: Fri Feb 11 17:31:57 2022 +0000 output more info for remap commit 80697d567625ad07196125b3fca2dceb551f84d0 Author: Slavko Brdar <[email protected]> Date: Fri Feb 11 17:30:51 2022 +0000 use next_index and prev_index commit ff9784d80431fa69416b6da1d1a43067bf085cdb Author: Slavko Brdar <[email protected]> Date: Fri Feb 11 14:15:57 2022 +0000 fix issue with pole multiplicity when contructing subpolygons in NodeColumn -> {Cell,Node}Column remappings commit f3b301b4de041c5c133bfe212435d9ccd2a9093a Author: Slavko Brdar <[email protected]> Date: Thu Feb 10 16:00:54 2022 +0000 remove unnecessary -if- condition commit c7cf03537536848caccfe11a54a282cba1b4eb0d Author: Slavko Brdar <[email protected]> Date: Tue Feb 8 16:52:53 2022 +0000 small fixes commit 1966ec61b8f0beef3882e57f6a8705c38e385d09 Author: Slavko Brdar <[email protected]> Date: Tue Feb 8 13:39:07 2022 +0000 readable coding commit cb19bfe2cf63452fd87ab09903673500e6b537fb Author: Slavko Brdar <[email protected]> Date: Tue Feb 8 09:54:55 2022 +0000 remove unused variable commit 3ec5fe2b0968645b2123e9793ad4162e8401b71d Author: Slavko Brdar <[email protected]> Date: Mon Feb 7 13:03:43 2022 +0000 build node-to-cell connectivity only when absolutely needed commit ae682e1a2706e30c5cf7f8ddbc9ca484176e3af1 Author: Slavko Brdar <[email protected]> Date: Mon Feb 7 11:22:02 2022 +0000 construct nodes-to-cell connectivity only if needed commit 8f029e7ba08fcd0f0073ff162c2633101d1b461b Author: Slavko Brdar <[email protected]> Date: Mon Feb 7 11:09:51 2022 +0000 use lonlat as default coordinates in test_interpolation_conservative commit 82a6f7f44407d2d2382d256ea4e4b12042b40a0d Author: Slavko Brdar <[email protected]> Date: Mon Feb 7 10:50:14 2022 +0000 fix error in std output for mpi > 1 commit e23056d6eb84087427c3b28f6a409a7cae506569 Author: Slavko Brdar <[email protected]> Date: Mon Feb 7 09:47:11 2022 +0000 fix std output commit 6cac0bef051c1f52862ad76d28666ea356b726c6 Author: Slavko Brdar <[email protected]> Date: Sun Feb 6 01:38:07 2022 +0000 fixing remap statistics for mpi > 1 commit 0522abe97d45f514a4c1c24650743f4be1d778ad Author: Slavko Brdar <[email protected]> Date: Sat Feb 5 01:15:24 2022 +0000 fix remap statistics for mpi>1 commit afff032d7a83bf05e50da77730e8e5451315e856 Author: Slavko Brdar <[email protected]> Date: Fri Feb 4 22:34:58 2022 +0000 avoid duplicate creation of functionspaces in setup of ConservativeMethod commit c53b0b49c1f9ceb693119a78dbf1fdf4fca6a1c7 Author: Slavko Brdar <[email protected]> Date: Fri Feb 4 17:56:52 2022 +0000 cleanup requirements on function spaces in ConsRemap commit bcecd07d2535ba60498574c5221d86b6ebf30704 Author: Slavko Brdar <[email protected]> Date: Fri Feb 4 17:47:08 2022 +0000 more statistic on remap with NodeColumns commit d8ec712c8af0e5236206b14cb188621bedaeb6a3 Author: Slavko Brdar <[email protected]> Date: Fri Feb 4 16:37:46 2022 +0000 check if 0 before dividing commit 8a1b28798d4d9b2331425e60de75d62837190714 Author: Slavko Brdar <[email protected]> Date: Fri Feb 4 16:13:37 2022 +0000 cleanup, remove edge connectivities commit 5d68220de7c0380bca4ddaa54522fc86921a0495 Author: Slavko Brdar <[email protected]> Date: Fri Feb 4 16:00:13 2022 +0000 cleanup, no more edge connectivity commit 33c0606e3deae1a0c0ea74b6de41c6fad0d5fec1 Author: Slavko Brdar <[email protected]> Date: Fri Feb 4 14:55:57 2022 +0000 add command line argumets for test_interplation_conservative commit 3a55a6b2e34d7e461acee3e27847f5f2a7b82f97 Author: Slavko Brdar <[email protected]> Date: Fri Feb 4 14:05:10 2022 +0000 more info on polygon inteersection in ConsRemap commit 7bd25ba220af47fb3678e3bd32cd8ddc765721ff Author: Slavko Brdar <[email protected]> Date: Fri Feb 4 13:18:14 2022 +0000 use same function signatures as in branch feature/spherical_polygons commit 2bf4aec16268f17b7143308994f780a41ed14265 Author: Slavko Brdar <[email protected]> Date: Thu Feb 3 15:59:36 2022 +0000 remove all edge connectivities in ConservativeMethod commit 20321cbe3a640a6f12ced723a865b9028c555f27 Merge: c9efaf685 86737ea22 Author: Slavko Brdar <[email protected]> Date: Tue Feb 1 00:16:04 2022 +0000 Merge branch 'features/conservative_remap' of ssh://git.ecmwf.int/atlas/atlas into features/conservative_remap commit c9efaf68532267d63c21772f0e7d98fbc9554625 Author: Slavko Brdar <[email protected]> Date: Tue Feb 1 00:15:51 2022 +0000 remove edge connectivity in creation of subpolygons for cons remap on NodeColumns commit 86737ea22818685610464625fc21119a69e5cf16 Merge: 088adc99d f548684e8 Author: Willem Deconinck <[email protected]> Date: Fri Jan 28 11:53:12 2022 +0000 Merge branch 'develop' into features/conservative_remap * develop: Add *= and /= operators to PointXYZ with scalar ATLAS-345 Use new eckit::linalg::LinearAlgebraSparse and eckit::linalg::LinearAlgebraDense API (see ECKIT-585) Prevent optimisation with NVHPC compiler in VariableResolutionProjection Adapt atlas_test_field_missingvalue as there is no standard on comparisons with NaN Workaround for Cray 8.7 compiler bug resulting in FE_DIVBYZERO in atlas_test_jacobian in Release build ATLAS-327 Workaround for Cray 8.7 compiler bug with CXX flags "-O2 -hfp1 -g -DNDEBUG" commit 6ac9ecbe8671b99be5eb76469be387679fd3ac44 Author: Slavko Brdar <[email protected]> Date: Thu Jan 27 11:15:51 2022 +0000 fix in USE_EDGE_CONNECTIVITY commit 088adc99da33f8bc4d7697a30cea7004a1071e3b Author: Slavko Brdar <[email protected]> Date: Wed Jan 26 14:20:21 2022 +0000 rewrite get_node_neighbours without edge_connectivity commit 3472ca1601bc7b1b80c6b0b4644c4d29a19f1930 Author: Slavko Brdar <[email protected]> Date: Thu Jan 20 10:45:41 2022 +0000 cleanup commit 0a5869063e329d8f96b579e2ed632af05ca34e72 Author: Willem Deconinck <[email protected]> Date: Tue Jan 18 22:31:46 2022 +0000 Add some debugging assertions and command-line options commit 8ea624bcf4a50e3a39ed533879949cf3c7c50e9e Merge: 9b51fbb12 298eb2e62 Author: Willem Deconinck <[email protected]> Date: Tue Jan 18 22:23:46 2022 +0000 Merge branch 'develop' into features/conservative_remap * develop: Fixup previous commit commit 9b51fbb12e7b9c1e7d052692e3b171ff6445432e Merge: e35aa47f3 4349a3ee3 Author: Willem Deconinck <[email protected]> Date: Mon Jan 17 09:07:56 2022 +0000 Merge branch 'develop' into features/conservative_remap * develop: (44 commits) Allow use of build_cells_remote_index() when halo was already built Apply clang-format Addressed reviewer comments. Permitted variable sized halos on functionspaces. Added ghost field to CubedSphereCellColumns functionspace. ATLAS-344 Fix atlas_test_healpixmeshgen CI with nvhpc-21.9 ATLAS-344 Fix MatchingMeshPartitionerLonLatPolygon to work with non-matching domains ATLAS-344 PolygonXY with Point2 member variables ATLAS-344 Printing of util::PolygonCoordinates ATLAS-344 Initialise halo field for healpix mesh Attempt at workaround of internal compiler error with OpenSuseTumbleweed Docker build ATLAS-343 [Github #82] Add experimental VariableResolutionProjection for UKV grid support Apply clang-format ATLAS-342 Patches to allow support for the Fujitsu compiler ATLAS-341 [Github #84] FiniteElement Interpolation with configurable max_fraction_elems_to_try ATLAS-340 [Github #81] Add CubedSphereDualMeshGenerator ATLAS-339 ArrayView assign from another ArrayView Fix clang-tidy warnings Update Changelog clang-format 13.0.0 -- WARNING, all files touched ... commit e35aa47f344aab5d4c9e4e95e20b3e5bc1422a57 Author: Slavko Brdar <[email protected]> Date: Thu Jan 13 14:08:42 2022 +0000 remove git merge conflict markers commit 0b8f49dda2db0ab3bed3c20f443ed7ba6927b712 Merge: 894f6c8df fb23e2c82 Author: Slavko Brdar <[email protected]> Date: Thu Jan 13 11:55:42 2022 +0000 Merge branch 'features/conservative_remap' of ssh://git.ecmwf.int/atlas/atlas into features/conservative_remap commit 894f6c8df864a9be24a2a7b617cd90383d2d7e94 Author: Slavko Brdar <[email protected]> Date: Thu Jan 13 11:43:12 2022 +0000 a fix in remap statistics commit fb23e2c823448a33ad3952c3cef426bf7ad2535f Author: Slavko Brdar <[email protected]> Date: Wed Dec 15 10:54:42 2021 +0000 make conservative remapping support function spaces as input commit 45ee4b0a301fa118097fbba5bbd839d1d25e63d8 Author: Slavko Brdar <[email protected]> Date: Tue Dec 14 15:19:49 2021 +0000 use eckit::parametrisation instead util::Config commit 8d62fdd0ac02966574252d7183fe6a16319cf918 Author: Slavko Brdar <[email protected]> Date: Wed Nov 24 18:06:18 2021 +0000 fix periodic boundary in cons remap for CellColumns on source mesh commit ee790e0db66803bb8bb69ffad37bc89000295d12 Author: Slavko Brdar <[email protected]> Date: Mon Nov 22 16:35:57 2021 +0000 make remapping work in parallel for tgt_halo_size > 0 (periodic bnd issue still) commit 99e8f1427c202619dd08baeb93de9a60732da0c8 Author: Slavko Brdar <[email protected]> Date: Tue Nov 9 15:43:29 2021 +0000 fix a bug in ConservativeMethod::tgt_points commit 236c306354c59653178fc3898505304ce09a7013 Author: Slavko Brdar <[email protected]> Date: Tue Nov 9 11:33:07 2021 +0000 cleanup commit 1ac747f2b342393418dca013ccc0a16b1e82112a Author: Slavko Brdar <[email protected]> Date: Mon Nov 8 17:18:09 2021 +0000 in ConservativeMethod, src_points(ID) and tgt_points(ID) has barycentre of the cell and/or dual cell of the node with index ID commit 06ed30f1c8c874e15295aa9f5a27d8b218266ea0 Author: Slavko Brdar <[email protected]> Date: Mon Nov 8 16:11:02 2021 +0000 working parallel version of 1/2 order cons remap, periodic boundary still a problem commit f89924a30af6513b1c482d9f633a3a374c83d736 Author: Slavko Brdar <[email protected]> Date: Fri Nov 5 17:57:31 2021 +0000 create src_mesh decomposition from tgt_mesh; problem when src is NodeColumns commit 00571340dec0334d27c8cd587f6c10f0177b6ecc Author: Slavko Brdar <[email protected]> Date: Thu Nov 4 16:51:38 2021 +0000 an almost correct running version of parallel 1st and 2nd order remapping, not working for NodeColumns-to-any commit 35f6f7801e3dc9a58e28514f15712d8947ba67bf Author: Slavko Brdar <[email protected]> Date: Wed Nov 3 15:02:22 2021 +0000 cleanup commit 45595b3c4d29092a374e928a3a51dc88cb99c6f0 Author: Slavko Brdar <[email protected]> Date: Mon Nov 1 18:04:56 2021 +0000 use std::tuple instead of std::pair in ConservativeMethod commit 78eb1e7c83a9db303c17675395b4f8ee232e5ab6 Author: Slavko Brdar <[email protected]> Date: Fri Oct 29 15:04:04 2021 +0100 allow mpi to be used, program crashes for mpi>1 commit 3203569a8e94ad37a61f3c7d2e5036cffc59e2d6 Author: Slavko Brdar <[email protected]> Date: Fri Oct 22 14:33:01 2021 +0100 fix matrix_free for halo>0. matrix_free works only for cell-to-cell remapping commit c68929b6e98f5929caf0ece36529edc116e079f7 Author: Slavko Brdar <[email protected]> Date: Fri Oct 22 10:29:47 2021 +0100 code readability commit ffb8a8bb57d2436cf332cf20332aaf5e0675ba5b Author: Slavko Brdar <[email protected]> Date: Thu Oct 21 18:05:35 2021 +0100 do not multiply weights in Gmsh error-fields commit f95ca78bcdc88c6859e715a2cb12486458772d3b Author: Slavko Brdar <[email protected]> Date: Thu Oct 21 17:40:39 2021 +0100 fix remapping output to Gmsh error-fields commit f5acb0415d64f88fa6b0be4c5debf3d00d844a06 Author: Slavko Brdar <[email protected]> Date: Thu Oct 21 15:49:20 2021 +0100 fix global conservation for 2nd order vertex-to-vertex remap commit d09f38a614ed9e5bb1c1d04bb1b33124d28947f4 Author: Slavko Brdar <[email protected]> Date: Thu Oct 21 12:02:36 2021 +0100 small fix readability commit 411198aa28814f131464bcea6d006f058254fa09 Author: Slavko Brdar <[email protected]> Date: Tue Oct 19 18:32:00 2021 +0100 use Field instead of std::vector commit 53ebc6eb5d2ec3923ee93bd144f298f17d19196c Author: Slavko Brdar <[email protected]> Date: Tue Oct 19 16:23:07 2021 +0100 fix computation of remap errors for halo > 0 commit 8b9d655b1d5f6b3fd2c281af3bef9e42a1fa8c7b Author: Slavko Brdar <[email protected]> Date: Thu Oct 14 16:34:25 2021 +0100 move remap error computation to ConservativeMethod commit cac9399fa34331376e19e9bc69a9d21a8674fb2c Author: Slavko Brdar <[email protected]> Date: Wed Oct 13 14:18:23 2021 +0100 clean up in ConservativeMethod commit 89fea6441ccedcd3f9a565d5ff3d3a2834571675 Author: Slavko Brdar <[email protected]> Date: Wed Oct 13 00:03:23 2021 +0100 correct use of ghost and halo in conservative remapping (tnx Willem) commit 26c789f61adb0ffa6d6a1cd2f8864c59224d9d77 Author: Slavko Brdar <[email protected]> Date: Thu Oct 7 22:50:29 2021 +0100 do not recompute gradient-sum in vertex 2nd order conservative remap commit 9c4f4e4661246190df9694c863cca2680610f785 Author: Slavko Brdar <[email protected]> Date: Thu Oct 7 17:38:00 2021 +0100 simplify for vertex and centroid versions commit c8f411d53b9006a57016ddd1b7e8f3e7492a77b6 Author: Slavko Brdar <[email protected]> Date: Thu Oct 7 16:19:53 2021 +0100 renaming variables for code consistency commit 59c7b8985df7657e25745fd54e7d24ecb887812c Author: Slavko Brdar <[email protected]> Date: Thu Oct 7 15:54:08 2021 +0100 cleanup commit f01a8615f8cde4de03ad602e88caefa2e17d444d Author: Slavko Brdar <[email protected]> Date: Thu Oct 7 15:46:03 2021 +0100 avoid recomputation of node-gradient for every subcell commit 23dc725624a4accea5678b43bc32ba4c4413f781 Author: Slavko Brdar <[email protected]> Date: Thu Oct 7 12:14:39 2021 +0100 bug fix in sorting edges (tnx Willem); vertex-to-vertex runs in 2nd order but no advantage over 1st order commit dff44b56e0996b93197e6e17955d1a7a9c654714 Author: Slavko Brdar <[email protected]> Date: Tue Oct 5 17:24:11 2021 +0100 build edges of both src and tgt meshes early in setup commit bfdc9418f6c55e3326f7970a79f72c00fa622c45 Author: Slavko Brdar <[email protected]> Date: Tue Oct 5 17:14:31 2021 +0100 assembled matrix for 2nd order from NodeColumn to NodeColumn/CellColumn - seg error still commit eb0dd9bce2f336b4765b7f0c6159beaa2b50cee3 Author: Slavko Brdar <[email protected]> Date: Fri Oct 1 23:10:39 2021 +0100 make 2nd order remap work for cell-to-vertex data commit df9ec9f8dece91c5320c3ea60232aa36f471bd8c Author: Slavko Brdar <[email protected]> Date: Fri Oct 1 18:06:02 2021 +0100 always compute subcell-to-node and node-to-subcell mapping in NodeColumns commit 1cf1093f01811ba7c3f8456192c6daaf3d518749 Author: Slavko Brdar <[email protected]> Date: Fri Oct 1 17:20:02 2021 +0100 finished 1st order remap for vertex-to-vertex, vertex-to-cell, cell-to-vertex, cell-to-cell data commit 564c23b328fd056c380f6fdfe328199d7f880bc4 Author: Slavko Brdar <[email protected]> Date: Fri Oct 1 15:15:58 2021 +0100 first vertex-to-cell remapping for 1st order working commit f1c07866ffdab26c1d34c15d4d11c8ad60462450 Author: Slavko Brdar <[email protected]> Date: Thu Sep 30 15:58:08 2021 +0100 correct computation of errors in polygon intersection for node data commit e2d064b14533f11ecb418c89feed25ceb69c6740 Author: Slavko Brdar <[email protected]> Date: Tue Sep 21 23:59:55 2021 +0100 compute area around node based on constructed subcells of mesh commit 00214f6f1def7231376ca79668e76646f4e8518b Author: Slavko Brdar <[email protected]> Date: Tue Sep 21 23:24:28 2021 +0100 cleaning -intersect_polygon- method commit 708657f0f67b8e4800a4184c79ee3503f2d31b9c Author: Slavko Brdar <[email protected]> Date: Tue Sep 21 23:10:21 2021 +0100 rename -centroid- to -point- to indicate where data points are store, consistent for node2node remapping commit eb9172d71152c1fdeb3f61a27b85f168d2efc7b1 Merge: 60e66ded7 96a976eb3 Author: Slavko Brdar <[email protected]> Date: Tue Sep 21 14:47:12 2021 +0100 Merge branch 'features/conservative_remap' of ssh://git.ecmwf.int/atlas/atlas into features/conservative_remap commit 60e66ded7a397377ea40b69ac8951a155a4f868d Author: Slavko Brdar <[email protected]> Date: Tue Sep 21 14:42:57 2021 +0100 rebasing with develop branch: resolve conflicts commit b7ca7c135bbd204225f529a9307042bfb7fd3547 Author: Slavko Brdar <[email protected]> Date: Tue Sep 21 00:24:49 2021 +0100 compute node2subcell and subcell2node in node2node remapping commit 9018aaa6f6a4cb47f3ac10a7aed4bbdf87c5c349 Author: Slavko Brdar <[email protected]> Date: Mon Sep 20 23:13:35 2021 +0100 further restructuring for node values commit 5510e166fa370cf7e44c421e968d1b83b9c87066 Author: Slavko Brdar <[email protected]> Date: Mon Sep 20 18:17:56 2021 +0100 more restructuring for vertex2vertex remapping commit afacba67d8ef69b7bd7f90d35b8b22e6c361a518 Author: Slavko Brdar <[email protected]> Date: Mon Sep 20 17:14:26 2021 +0100 add src_cell_data and tgt_cell_data to ConservativeMethod to allow for Cell- and NodeColumns in remapping commit 7a6d00d47761a8183f69d2e5601189e79906e8f0 Author: Slavko Brdar <[email protected]> Date: Mon Sep 20 15:21:16 2021 +0100 new method for circular ordering of edges and neighbouring cells commit 0f7f1dabf1b02876d0e0f2d4f3e3e1c20f4e8d20 Author: Slavko Brdar <[email protected]> Date: Thu Sep 16 17:04:55 2021 +0100 fix problem with non existing neighbour (tnx Willem) commit 76b0d332ca5d72f6c2d74930157ae1d6253d7d61 Author: Slavko Brdar <[email protected]> Date: Wed Sep 15 15:02:21 2021 +0100 clean up commit 04d42261565adf88e07c89712ddf3bf1df5bbd57 Author: Slavko Brdar <[email protected]> Date: Mon Sep 13 18:29:09 2021 +0100 consistent naming commit dbcdd158ced7518f9bfb9b6ad7bcb1f83265b227 Author: Slavko Brdar <[email protected]> Date: Mon Sep 13 18:15:55 2021 +0100 creation of sub-elements for vertex-vertex remapping commit b7ff02fa25b1428e26f1f69d148326f9ebe8c676 Author: Slavko Brdar <[email protected]> Date: Tue Jun 22 16:33:15 2021 +0100 bug fix in computing the global conservation error commit bf948f4098cc7e876958fae98655f75a457373a9 Author: Slavko Brdar <[email protected]> Date: Wed Jun 16 15:28:55 2021 +0100 apply clang tool commit 39f7f99bcf6a4465af1fce0ee4ba24906db32347 Author: Slavko Brdar <[email protected]> Date: Wed Jun 16 15:28:38 2021 +0100 revisit computation of errors in conservative remapping commit 3c1f5c4c12f5ffd92406073f3d5e5101222dcbcf Author: Slavko Brdar <[email protected]> Date: Tue Apr 20 15:49:36 2021 +0100 setup of cached matrix for cons-2 can work without pre-sorting of triples commit 7a93b85e0182b3fca2cb2795c8924bcdb9263eeb Author: Slavko Brdar <[email protected]> Date: Tue Apr 20 15:45:11 2021 +0100 simplification in computing cached matrix for cons-2 commit 9c5d226f72e111cb572d874e4fb746d5fb9d50c0 Author: Slavko Brdar <[email protected]> Date: Tue Apr 20 15:40:42 2021 +0100 generate sparse matrix for Method::execute for cons-2 commit aa00c3309cd1257c489fdd6c8a803fceaad62c90 Author: Slavko Brdar <[email protected]> Date: Wed Apr 14 21:23:43 2021 +0100 set target_field to zero only when necessary, i.e. not for Method::do_execute commit cd48eff63dcfd0d3758d6934f71bf67e9ecc18b1 Author: Slavko Brdar <[email protected]> Date: Wed Apr 14 18:17:54 2021 +0100 make ConservativeMethod inherit from Method and assemble Method::Matrix for cons-1 commit ca0269a8d2bf9b428800230e80b7e8ab4826d18d Author: Slavko Brdar <[email protected]> Date: Mon Apr 12 18:35:52 2021 +0100 code clean up commit 9deeed6b5a36655d2358e8fbdcb3a3dcb160358e Author: Slavko Brdar <[email protected]> Date: Mon Apr 12 18:28:29 2021 +0100 final 2x speed up of cons-2 in matrix-nonfree version / conservative remapping commit 6ae3bd549d7d6aec64581910b1fc6fac2f318f9d Author: Slavko Brdar <[email protected]> Date: Fri Apr 9 17:40:08 2021 +0100 compute barycentre for 2nd order remap after all, not to lose conservation commit 7a7d82f8226187799b56a684f3f16d770c66b502 Author: Slavko Brdar <[email protected]> Date: Thu Apr 8 16:39:40 2021 +0100 use matrix_free=false by default and correct const return on non-reference types (tnx Willem) commit 59f30e87a417fcaf3188d04918acdcdd52e40abc Author: Slavko Brdar <[email protected]> Date: Thu Apr 8 16:27:59 2021 +0100 speed up 20x for cons-2 conservative remapping commit 1d553a80c732ec73e6d41a5fd0ba3057048e711a Author: Slavko Brdar <[email protected]> Date: Wed Apr 7 17:05:19 2021 +0100 no need to recompute barycentres in ConservativeMethod commit 75f2a43769b85b53291328a1d4c6d67e01d47b7b Author: Slavko Brdar <[email protected]> Date: Wed Mar 31 16:39:32 2021 +0100 apply clang commit fee80963c092de14da6df9be83aedd8389df64c7 Author: Slavko Brdar <[email protected]> Date: Wed Mar 31 16:30:37 2021 +0100 add matrix_free option to ConservativeMethod commit b07e8d2f396ade4f080d27d9db382093fd6ef5e2 Author: Slavko Brdar <[email protected]> Date: Wed Mar 31 15:43:17 2021 +0100 1) add get_neighbours for consecutive number of neighbour cells; 2) preparing for v2v, c2v etc commit 8253e0e97417a34bb0b5afd745a3089fa4ea361c Author: Slavko Brdar <[email protected]> Date: Tue Mar 30 18:26:04 2021 +0100 use member function get_polygon to select ConvexSphericalPolygons from Mesh commit 6b9eba58984bf316234df8e7061a95c24690208c Author: Slavko Brdar <[email protected]> Date: Tue Mar 30 16:06:36 2021 +0100 add dump_intersection in ConvexSphericalPolygon commit 5a8f1c58ba160344055642b42bb9fbfffe96d61a Author: Slavko Brdar <[email protected]> Date: Tue Mar 30 15:44:49 2021 +0100 make 1st cons remapping 5x faster commit 60dde3fa97b6096fff76bc1a4941803972f14b05 Author: Slavko Brdar <[email protected]> Date: Mon Mar 29 22:20:00 2021 +0100 more debug in case of large intersection accuracy error commit e042a363817bfabea38a8fa37ce5d4b1e3dd3d48 Author: Slavko Brdar <[email protected]> Date: Thu Mar 25 15:48:20 2021 +0000 cleanup commit 1ca6100114c7ebdb4373c1a115cb6ccfacb48135 Author: Slavko Brdar <[email protected]> Date: Thu Mar 25 14:39:21 2021 +0000 remove warning commit 08057b924b01a4051c9ee9afa6e8a1ac28808825 Author: Slavko Brdar <[email protected]> Date: Thu Mar 18 16:23:04 2021 +0000 fix accuracy bug in 2nd order cons remap commit 20180a5f7f99fec7b266305982dbd71b9aa8801e Author: Slavko Brdar <[email protected]> Date: Thu Mar 18 14:14:54 2021 +0000 apply clang commit 5ffad33483f902bb1ea6a9b1c3a527318a8ef474 Author: Slavko Brdar <[email protected]> Date: Thu Mar 18 12:03:03 2021 +0000 better variant of polygon intersection commit b177870c74809b668c7c51302d46491bd5a0a636 Author: Slavko Brdar <[email protected]> Date: Thu Mar 18 09:06:45 2021 +0000 change in polygon intersections commit c2ec2a4a26df4cf026f0dff47711675af18613b3 Author: Slavko Brdar <[email protected]> Date: Mon Mar 15 15:12:30 2021 +0000 compute polygon area by triangulating first commit ae54a85b05b05809e993c3a191409e3dbfb04c69 Author: Slavko Brdar <[email protected]> Date: Mon Mar 15 09:17:05 2021 +0000 forgot file in the pervious commit commit f647cb09466f013f8b86638752ba5b4e59f4d529 Author: Slavko Brdar <[email protected]> Date: Mon Mar 15 09:16:39 2021 +0000 specify polygon-intersection tolerances each time explicitly commit 3983ba5c786777f7af9566ae5d6ab508f3c77c47 Author: Slavko Brdar <[email protected]> Date: Thu Mar 11 17:42:09 2021 +0000 fix in CSPolygon unit tests commit e7f72010598fed7b906eb8ef284a70e706f9a4a2 Author: Slavko Brdar <[email protected]> Date: Thu Mar 11 17:39:05 2021 +0000 cons remappign for every grid with ever grid; apply clang commit b355cb519f9a9451847fe78c355a76b46218c6d6 Author: Slavko Brdar <[email protected]> Date: Wed Mar 10 10:43:40 2021 +0000 check for global cons error between mapping fields commit 2013e086caad73e406e3c5619beaa04ad8463c17 Author: Slavko Brdar <[email protected]> Date: Tue Mar 9 14:36:26 2021 +0000 explicitly specify tolerance in ConvexSphericalPolygon intersections commit 6ef6a38400f2c87c787e242dd6e8f0f9a3407eee Author: Slavko Brdar <[email protected]> Date: Mon Mar 8 18:29:14 2021 +0000 cleanup and normalisation of remap to remedy polygon-intersection issues commit b524e688ae4d70e2b1a544e98ce2a94d40da4c7c Author: Slavko Brdar <[email protected]> Date: Thu Mar 4 11:57:56 2021 +0000 Sutherland-Hodgman polygon intersection on sphere - not robust yet commit 8905f3359cb1eece45accd985a8f917d80e5a8cf Author: Slavko Brdar <[email protected]> Date: Fri Feb 12 18:12:55 2021 +0000 debug output for ConvexSphericalPolygon commit 32fbbe7a32512394e17634b983a817e5720c70ce Author: Slavko Brdar <[email protected]> Date: Fri Feb 12 17:59:33 2021 +0000 more debug for ConvexSphericalPolygon commit cdda1ef7ed1174b2abf86bab862e2482a1972074 Author: Slavko Brdar <[email protected]> Date: Fri Feb 12 17:05:41 2021 +0000 prepare debug in case of bad ConvexSphericalPolygon intersections commit 998c889700cdaee5dc146245ff0c3164f6af3f6d Author: Slavko Brdar <[email protected]> Date: Sat Feb 6 00:55:59 2021 +0000 remove unneccessary function commit 0306c2a2bb0fa12a3238f04e31cfae1731af0849 Author: Slavko Brdar <[email protected]> Date: Thu Feb 4 18:36:42 2021 +0000 make empty polygons equal commit 7f621acb49d8760c6fa3fe259290c1a3bf30a32c Author: Slavko Brdar <[email protected]> Date: Thu Feb 4 14:50:24 2021 +0000 back to not-so-bad polygon intersecting (not ideal yet) commit 47fec9cacafd14efa5edcf44772dea6b859c1fdd Author: Slavko Brdar <[email protected]> Date: Wed Feb 3 19:37:42 2021 +0000 fix bug in polygon intersection algorithm commit 165c0f77c98622a82c6a623c7d824caa4cfeeeec Author: Slavko Brdar <[email protected]> Date: Tue Feb 2 11:51:16 2021 +0000 use kdtree to search for candidate intersector polygons (significant speed up) commit 85c4e397eb09f42d5c8d738306a5ac59b46b2194 Author: Slavko Brdar <[email protected]> Date: Tue Feb 2 11:50:26 2021 +0000 one more scpecific polygon intersecting in unit test commit 075de5f62ef1cf241d1bd2bc9d0c20b1a15571c4 Author: Slavko Brdar <[email protected]> Date: Tue Feb 2 01:23:58 2021 +0000 bug fix commit ceab090e5813c676277e234f3b3f005c3c6cadfc Author: Slavko Brdar <[email protected]> Date: Tue Feb 2 01:18:13 2021 +0000 warn about non covered source mesh area in remapping commit 43b217bf7dea61c6a397d53d45db8afc132b837a Author: Slavko Brdar <[email protected]> Date: Tue Feb 2 01:14:49 2021 +0000 another fix for remap H16 -> H256 commit 6a01e925b8f216e3b3e51dfa82ab9edda662614b Author: Slavko Brdar <[email protected]> Date: Mon Feb 1 18:15:10 2021 +0000 cleanup and one more unit test for polygon intersections commit cb1502608861e3e04ce94f74b1d114f88a79180b Author: Slavko Brdar <[email protected]> Date: Mon Feb 1 18:12:09 2021 +0000 fix crashes in intersecting polygons of higher resolution Atlas grids commit 2cd239a6852b68fe90e3778e32af32ea07a1b8cb Author: Slavko Brdar <[email protected]> Date: Sat Jan 30 00:56:49 2021 +0000 fix 2nd order accuracy in conservative remap commit 31950f2bcef3bf0960ba731fe64d5253a2ab4cd0 Author: Slavko Brdar <[email protected]> Date: Thu Jan 28 18:13:31 2021 +0000 output test diagnostic in separate files for each CASE of cons.remap. unit test commit 8eb08f1b9821c7e473aba88e32971b10e33e286a Author: Slavko Brdar <[email protected]> Date: Thu Jan 28 18:12:44 2021 +0000 ask 1e-14 precision for vertex2vertrex equality of polygons commit 3947afe9e7b0ac4f3196d8579c47ce1a063a2b80 Author: Slavko Brdar <[email protected]> Date: Thu Jan 28 18:11:10 2021 +0000 add specific problematic polygons for intersections commit 377f035752469620e9a970d7084b07a791128b28 Author: Slavko Brdar <[email protected]> Date: Thu Jan 28 16:43:09 2021 +0000 bug fixes and more diagnostic output commit 9c8308989135017114e9565362338ca5d1dc0aca Author: Slavko Brdar <[email protected]> Date: Tue Jan 19 18:18:16 2021 +0000 write positive error thru gmsh and data in lonlat space commit 9a0dd5940ff710b7d0064503559cabaa491db294 Author: Slavko Brdar <[email protected]> Date: Tue Jan 19 14:02:32 2021 +0000 cleanup commit 6046b881f93d5d18b4cea2f40cb73450776e615b Author: Slavko Brdar <[email protected]> Date: Tue Jan 19 12:07:48 2021 +0000 more fixed in computing errors in cons. remap commit c5ea17b7fded09d8a9ccf22e28776eab8356c4e1 Author: Slavko Brdar <[email protected]> Date: Mon Jan 18 19:37:16 2021 +0000 a not so good example O32->N32 commit d5361984a8b831c944bda1d27ec1c0c1bbf04903 Author: Slavko Brdar <[email protected]> Date: Mon Jan 18 19:13:21 2021 +0000 cleanup commit 6045d04b0b2d8aa83c5ff2530b10fd9e15aa1bb4 Author: Slavko Brdar <[email protected]> Date: Mon Jan 18 19:11:10 2021 +0000 cleanup commit 60f1a279fc595fe72699a1b98d218a286d050876 Author: Slavko Brdar <[email protected]> Date: Mon Jan 18 18:17:46 2021 +0000 cleanup commit 4b83a11391b08bc946357fb4be304ce6cb848bc7 Author: Slavko Brdar <[email protected]> Date: Mon Jan 18 16:45:33 2021 +0000 minor corrections commit 5a5ab5f0ed27f63ee3c94955bc66350452365645 Author: Slavko Brdar <[email protected]> Date: Fri Jan 15 14:06:03 2021 +0000 improve unit test for cons remaps commit 7fa29ef103fff85e2b139c957614e37329654909 Author: Slavko Brdar <[email protected]> Date: Fri Jan 15 14:03:09 2021 +0000 debugging 2nd order cons commit 65d23ec1f9ef5a146f67a4b10b6ceb0d9befaeaa Author: Slavko Brdar <[email protected]> Date: Thu Jan 14 17:49:36 2021 +0000 bug fix commit d282655a14e7304344f395933c92959a381640b5 Author: Slavko Brdar <[email protected]> Date: Thu Jan 14 15:30:40 2021 +0000 another fix for higher resolution: increase search radius by 1.3x commit a14f0f9852788a1e30c0feaa86b41925b3d738f5 Author: Slavko Brdar <[email protected]> Date: Wed Jan 13 18:58:37 2021 +0000 more comprehensive test for soncervative remapping commit f71a228d0f3ced50201018d5a420daafbd46cf35 Author: Slavko Brdar <[email protected]> Date: Wed Jan 13 18:52:54 2021 +0000 not too strict on polygon area commit e59671f75f672a636bc030f6c846181f58d7e095 Author: Slavko Brdar <[email protected]> Date: Wed Jan 13 16:53:06 2021 +0000 8x speed up of ConservativeMethod::do_setup commit 228d362d0e5dc8835624799d5947783ea266f088 Author: Slavko Brdar <[email protected]> Date: Wed Jan 13 16:15:41 2021 +0000 allow zero area polygons commit fc56644db06de69d2073e417148d5886c7753bdb Author: Slavko Brdar <[email protected]> Date: Tue Jan 12 18:50:20 2021 +0000 fix bugs in onSegment for high-res atlas grids (still checking for more bugs) commit 5dd8d8840ec90b5866101cd61481acacdc30f515 Author: Slavko Brdar <[email protected]> Date: Mon Jan 11 18:53:40 2021 +0000 expand unit test for conservative remap commit 4cd98e308ab680aed86dde347f958bdd4edb39ef Author: Slavko Brdar <[email protected]> Date: Mon Jan 11 18:50:06 2021 +0000 improve polygon equality commit c808383070427e4cc4a2fa237d6cd4681897deb6 Author: Slavko Brdar <[email protected]> Date: Sun Jan 10 00:39:39 2021 +0000 compute errors as in Kritsikis et al. commit 833c01d4f0fbc72e8fbe0023c86336251f963405 Author: Slavko Brdar <[email protected]> Date: Thu Jan 7 19:14:02 2021 +0000 compute global and local conservation errors commit c5e9ff09a10be24efa5cc193fd39488f946dcc92 Author: Slavko Brdar <[email protected]> Date: Thu Jan 7 18:14:08 2021 +0000 when intersecting quads, max number of vertices of intersection polygon can be 8 commit 50a47049fcd791ef1484e3d884f1c681b0c201a3 Author: Slavko Brdar <[email protected]> Date: Wed Jan 6 15:41:33 2021 +0000 make 1st and 2nd order convervative run with healpix as well (tnx Willem) commit c0584dded115340db1bf099647acccc370f89ce2 Author: Slavko Brdar <[email protected]> Date: Wed Jan 6 15:06:56 2021 +0000 make cons. remap work for Healpix meshes (2nd order cons. does not work git diff ../interpolation/method/knn/ConservativeMethod.cc ConvexSphericalPolygon.cc ../../tests/interpolation/test_interpolation_conservative.cc) commit 0240547e435ce23666ea7a9b29e4da9291f24da4 Author: Slavko Brdar <[email protected]> Date: Tue Jan 5 18:06:03 2021 +0000 add source mesh as member of ConservativeMethod commit 30e7819474ba2a9a33a3509035b95780e0c6df87 Author: Slavko Brdar <[email protected]> Date: Tue Jan 5 17:53:58 2021 +0000 add ProgressTimer in brute force polygon intersections commit 2b84b6dc82123bf31e4eb8d06ec99d44719c4e9f Author: Slavko Brdar <[email protected]> Date: Tue Jan 5 17:41:04 2021 +0000 a better test for 1st order cons remap commit 43ae480ce7289e20799d703612b3eb7aec10768b Author: Slavko Brdar <[email protected]> Date: Tue Jan 5 17:36:29 2021 +0000 a working 1st order conservative remap on O8 commit 7489e7e05c5ff10b0dbf6f8a6893f18a2235e9a0 Author: Slavko Brdar <[email protected]> Date: Tue Jan 5 17:15:53 2021 +0000 correct counter-clockwise orientation for vertices of a grid cell based on structured (regular meshgen has the oposite) commit f5e36b2f10f2e9f4abde4da9ac44e0a1a033d372 Author: Slavko Brdar <[email protected]> Date: Tue Jan 5 16:00:04 2021 +0000 apply clang-format commit 7267abbe3084793ec0ffdab6386e5d9c22822c29 Author: Slavko Brdar <[email protected]> Date: Tue Jan 5 15:59:11 2021 +0000 move cons. interpolation to atlas/interpolation/method/knn/ConservativeMethod.h,cc commit 706752be4870a08553ccc1fd772fc986a9c25c88 Author: Slavko Brdar <[email protected]> Date: Mon Jan 4 19:06:47 2021 +0000 apply clang-format commit 37b458d2144a3846dbe02b5a9e47db6910f1ff15 Author: Slavko Brdar <[email protected]> Date: Mon Jan 4 19:04:08 2021 +0000 ConvexSPhericalPolygon does not need vertex orientation commit 82014a0637a2163baadef79754f4391c35701a76 Author: Slavko Brdar <[email protected]> Date: Mon Jan 4 15:57:54 2021 +0000 make area of ConvexSphericalPolygon with two distinct point equal 0 commit 3a4691c8768e4f69786db39fafa2f816b42329d9 Author: Slavko Brdar <[email protected]> Date: Mon Jan 4 15:18:14 2021 +0000 use coordinate-based distance rather that vector norm commit 6905957a40a77d3ba1aae7b0484acbf392861495 Author: Slavko Brdar <[email protected]> Date: Mon Jan 4 12:10:50 2021 +0000 print lonlat instead of xyz coords in debug prints of ConvexSphericalPolygon; apply clang-format commit 4737bd47aab4c65ef3549e97a9566011034b9cfc Author: Slavko Brdar <[email protected]> Date: Sun Jan 3 23:57:59 2021 +0000 cache area for ConvexSphericalPolygon commit abf9dfb8c613c618836b39be592fbb16c168fd3a Author: Slavko Brdar <[email protected]> Date: Sun Jan 3 01:12:25 2021 +0000 fix gradient of 2nd order cons as in Kritsikis et al. commit d46f5a0a62d191f627d2b054623c64da87135d09 Author: Slavko Brdar <[email protected]> Date: Sun Jan 3 00:29:32 2021 +0000 fix gradient in 2nd order cons, print error on target grid commit fa21d9cc05d41060975dcbf9993c63eab62314a9 Author: Slavko Brdar <[email protected]> Date: Thu Dec 31 17:57:13 2020 +0000 a non-constant test working correct commit 27d1bbf18f11e1de1a6f041c0bcdfc2e53494b45 Author: Slavko Brdar <[email protected]> Date: Thu Dec 31 17:31:00 2020 +0000 running correctly for constant function commit 1026abc7896f9b36fc35dcd66b156b468ee86aaf Author: Slavko Brdar <[email protected]> Date: Wed Dec 30 19:10:52 2020 +0000 first running version of 2nd order conservative remap example (albeit buggy) commit bd3f86fc03e48b2b78daf3483572d8638f79b614 Author: Slavko Brdar <[email protected]> Date: Tue Dec 29 18:13:57 2020 +0000 test case for conservative remapping (not done yet) commit f6e0e4c14dd39397c4ae1ff70fd9bdf0a31250bf Author: Slavko Brdar <[email protected]> Date: Tue Dec 29 18:13:07 2020 +0000 centroid of ConvexSphericalPolygon should be on sphere commit 9d04bd72665ad67ace8f928e587548bb535c03c3 Author: Slavko Brdar <[email protected]> Date: Thu Dec 17 23:22:17 2020 +0000 unit test example: given two grids compute remapping weights, centroids for conservative remapping commit 9116c91e9dad6524539099f673ff9f0d1837c08a Author: Slavko Brdar <[email protected]> Date: Thu Dec 17 23:21:01 2020 +0000 bug fix in ConvexSphericalPolygon initialization commit 7e29a3d1cd4e6a07f4544850ee6fdfcd5fb5f30d Author: Slavko Brdar <[email protected]> Date: Thu Dec 17 16:24:52 2020 +0000 reverse ordering of vertices from node_connectivity for ConvexSphericalPolygon commit b3fc0dc29d9844902532e5af4c77e7ea28cda979 Author: Slavko Brdar <[email protected]> Date: Thu Dec 17 15:26:59 2020 +0000 a buggy test in orientation of element vertices commit 2360a2b890c2197d3ddcb44d4ba865dbb9f1b39c Author: Slavko Brdar <[email protected]> Date: Thu Dec 17 15:26:23 2020 +0000 empty polygon should have area = 0 commit 57da76d8e4bc6ebbd8ce4d21fc982fd2f54d6492 Author: Slavko Brdar <[email protected]> Date: Thu Dec 17 15:15:08 2020 +0000 use RegularMeshGenerator for regional grids, still get strange elements commit fdf038d1928ce0f40af2c651c5d0b441ef90ea9e Author: Slavko Brdar <[email protected]> Date: Thu Dec 17 15:05:22 2020 +0000 unit test for intersecting elements of two regional grids commit 05e64ef8140abbfba8a118a17b904c9038d34163 Author: Slavko Brdar <[email protected]> Date: Thu Dec 17 14:59:18 2020 +0000 print of Polygon should be in more user friendly lonlat coordinates commit d78592915ff4c73b28eabeb51ce6d8a29851c25a Author: Slavko Brdar <[email protected]> Date: Wed Dec 16 17:53:43 2020 +0000 fix memory leaks (tnx Willem) commit 62b3642b4a916d481f09165dcb6bd7982c4e35c3 Author: Slavko Brdar <[email protected]> Date: Wed Dec 16 16:33:34 2020 +0000 remove the last repetition point in ConvexSphericalPolygon commit 7b80f98bbc066eaaf31a7bfa07e73a20f5c80ec1 Author: Willem Deconinck <[email protected]> Date: Wed Dec 16 14:07:53 2020 +0000 ATLAS-322 ConvexSphericalPolygon lives on stack entirely, with support of MAX_SIZE=8 points commit ee2721108a7cbeba950892baae9b3a630340e29b Author: Willem Deconinck <[email protected]> Date: Wed Dec 16 13:34:15 2020 +0000 ATLAS-322 clang-format commit 585031d9a26f674500ec9b9222eb51efb7e12633 Author: Willem Deconinck <[email protected]> Date: Wed Dec 16 13:32:27 2020 +0000 ATLAS-322 No more pointers (and memory leaks) commit 7d88a3938b6c67289e7defd2f9df7b54e8cc7e79 Author: Willem Deconinck <[email protected]> Date: Wed Dec 16 13:03:04 2020 +0000 ATLAS-322 ConvexSphericalPolygon operator<< commit 9ae25ea9e3173337244eca1fc1668a4112597177 Author: Willem Deconinck <[email protected]> Date: Wed Dec 16 12:59:15 2020 +0000 ATLAS-322 No more pointers in ConvexSphericalPolygon commit 87fc2d095d54fc9eec2570f373487ead5a3d0557 Author: Willem Deconinck <[email protected]> Date: Wed Dec 16 12:47:54 2020 +0000 ATLAS-322 ConvexSphericalPolygon default constructor commit 2359bc004bf86ca56f1b56968d22021e8ae16c3e Author: Willem Deconinck <[email protected]> Date: Wed Dec 16 12:40:25 2020 +0000 ATLAS-322 Do not inherit ConvexSphericalPolygon from PolygonCoordinates commit 330b58fe971b774e15a8c8803336cf4fb09fc9ed Author: Slavko Brdar <[email protected]> Date: Tue Dec 15 17:01:18 2020 +0000 add centroid of spherical polygon commit bb12955c9ea5e427fdafd1b53169cabaa5fff393 Author: Slavko Brdar <[email protected]> Date: Tue Dec 15 16:33:23 2020 +0000 area of spherical polygons commit 6a311d80b8dbdb6194eef88b8c1a5108e0468e00 Author: Slavko Brdar <[email protected]> Date: Mon Dec 14 17:58:51 2020 +0000 more comprehensive unit test for spherical polygon intersections commit f7f583305540d6559d9ad1c0364f9b4f5fe0b3a1 Author: Slavko Brdar <[email protected]> Date: Thu Dec 10 16:40:10 2020 +0000 34 example of polygon intersections working fine, note sensitive value for eps commit 89459670f951f02c86db8bd4c6a195db4ae7d255 Author: Slavko Brdar <[email protected]> Date: Thu Dec 10 15:52:57 2020 +0000 improve in unit test output, show what two polygons intersect, and the resulting polygon commit 6b12251ba4ed03953e1f5479514791b4a7276f6a Author: Slavko Brdar <[email protected]> Date: Thu Dec 10 15:26:49 2020 +0000 another bug fix, more compact unit test commit 4745ffbc821bd7b98b0343a116f8d01afbd72aac Author: Slavko Brdar <[email protected]> Date: Thu Dec 10 14:06:38 2020 +0000 replace fabs with abs (thx Willem) commit 5185990acd1bb37d8c52b70cd701d2eb6e5eb45b Author: Slavko Brdar <[email protected]> Date: Thu Dec 10 12:42:40 2020 +0000 fix bugs, plus more test cases commit 414e37064bdf0e575ee8b9f37546817a52406e4d Author: Slavko Brdar <[email protected]> Date: Wed Dec 9 18:54:40 2020 +0000 first working version of convex polygon intersections on sphere commit d0a310e8ef106c51b255b792018c277de810586e Author: Slavko Brdar <[email protected]> Date: Wed Dec 9 11:30:23 2020 +0000 almost working spherical polygon intersection commit f607b052c71f4794b9d2baa3ae7d342acb00c656 Author: Slavko Brdar <[email protected]> Date: Tue Dec 1 17:22:47 2020 +0000 recursive search of intersection polygon, not done yet commit 8577c38d96c742038570c67b1b060b51ad9ec7c9 Author: Slavko Brdar <[email protected]> Date: Mon Nov 23 18:14:55 2020 +0000 correct intersection of spherical segments commit 06e7292a04bfae4dc85e5bc2aa8e5bfbbe2b1094 Author: Slavko Brdar <[email protected]> Date: Fri Nov 20 17:09:43 2020 +0000 add ConvexSphericalPolygon and test_spherical_geo commit 96a976eb366897496239f97035ceacd84767f15a Author: Slavko Brdar <[email protected]> Date: Tue Sep 21 00:24:49 2021 +0100 compute node2subcell and subcell2node in node2node remapping commit aa1b79229d8777cd4cc09e0e9aafe7a419e1e2c0 Author: Slavko Brdar <[email protected]> Date: Mon Sep 20 23:13:35 2021 +0100 further restructuring for node values commit b6f5410a06bec11f7244c9da8a09f2fbd45de68e Author: Slavko Brdar <[email protected]> Date: Mon Sep 20 18:17:56 2021 +0100 more restructuring for vertex2vertex remapping commit bf43285bf26a7b8aa10c45c3bc95205f38e3b657 Author: Slavko Brdar <[email protected]> Date: Mon Sep 20 17:14:26 2021 +0100 add src_cell_data and tgt_cell_data to ConservativeMethod to allow for Cell- and NodeColumns in remapping commit a47a959f9bb4cefc33c0b4b45bb46645fb173edf Author: Slavko Brdar <[email protected]> Date: Mon Sep 20 15:21:16 2021 +0100 new method for circular ordering of edges and neighbouring cells commit 196f0a705391d7c87777974b5734680bf54fac69 Author: Slavko Brdar <[email protected]> Date: Thu Sep 16 17:04:55 2021 +0100 fix problem with non existing neighbour (tnx Willem) commit 5c266a312bf58d56538b2cb153bd39a5d4b93b56 Author: Slavko Brdar <[email protected]> Date: Wed Sep 15 15:02:21 2021 +0100 clean up commit eb5e2789d2434c87b07213a1897ac7ebfbdd3a8f Author: Slavko Brdar <[email protected]> Date: Mon Sep 13 18:29:09 2021 +0100 consistent naming commit 096374097aceb5aee8c3546efdc17f751eec9792 Author: Slavko Brdar <[email protected]> Date: Mon Sep 13 18:15:55 2021 +0100 creation of sub-elements for vertex-vertex remapping commit 8e9d9dac0b7e0e331dde76a5d9bdc0ab09c6fabf Author: Slavko Brdar <[email protected]> Date: Tue Jun 22 16:33:15 2021 +0100 bug fix in computing the global conservation error commit 22cb2961af2a9d74f8835c2c298d16ed10de6b32 Author: Slavko Brdar <[email protected]> Date: Wed Jun 16 15:28:55 2021 +0100 apply clang tool commit c8d33dce988a44329d541ce3f8ce117bc9e9f2ca Author: Slavko Brdar <[email protected]> Date: Wed Jun 16 15:28:38 2021 +0100 revisit computation of errors in conservative remapping commit 6eb377042db67e74efaa98764696d54082f8cf1e Merge: a2ca551bb 99fedb2c6 Author: Slavko Brdar <[email protected]> Date: Mon Jun 7 14:59:28 2021 +0100 Merge remote-tracking branch 'ec-atlas/develop' into features/conservative_remap commit a2ca551bb5f65709c65879270c3694fdaec7f10d Author: Slavko Brdar <[email protected]> Date: Tue Apr 20 15:49:36 2021 +0100 setup of cached matrix for cons-2 can work without pre-sorting of triples commit efc85767ed8523fef8d2e4…
This is PRs 86 and 87 from JCSCA-internal, merged into one. The functionality added is as follows:
PR 86
This PR add functionality to the dual mesh halo. Now, the halo size can be set to any value < N-1, where N is the grid-size of a cubed sphere tile. This allows arbitrary-sized stencil operations to work on the cubed-sphere dual mesh.
An example of a cubed sphere dual mesh partition (8 PEs, default partitioner) with a halo of 3 is shown below.
xy projection of an N48 partition with a halo of 3.
xyz projection of an N48 partition with a halo of 3.
I've updated several of the existing cubed sphere dual mesh tests to use larger halo sizes.
PR 87
This PR predominantly adds an
(x, y)
to(alpha, beta)
projection for tilet
. Here,(alpha, beta)
is defined strictly as the angular coordinates described by Ronchi et al., (1996).In practice, the transform is a simple shift and rotate for
xy
coordinates internal to tilet
. A non-linear stretch is applied for external points (i.e. haloxy
coordinates).The following example considers tile
t=0
of the LFRic cubed sphere dual mesh, withhalo = 3
. The first image shows thexy
projection. The second image gives the(alpha, beta)
projection.This required changes to several classes, summarised as follows:
tileCenter
andtileJacobian
which return thexy
centre andd_xy/d_alphabeta
Jacobian for each tile.meshgenerator::detail::cubedsphere::Jacobian2 removed class and added equivalent toutil
namespace.projection::detail::ProjectionImpl::Jacobian
class.Tiles
methods. This minor refactoring therefore serves as a test for the changes.CubedSphereProjectionBase
redistribution::detail::RedistributionGeneric removedrank <= 3
constraint. Not related to projection, but it was an easy fix.This transform is currently only implemented for the equiangular cubedsphere projection. It is also likely that I've introduced some unnecessary redundancy to the
CubedSphereProjectionBase
andTiles
classes. However, given that we intend to refactor the cubed sphere grid at some point, we'll eventually need to refactor these classes too.