Support GPU lazy field arithmetic operators #3385
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -1008,7 +1008,8 @@ class ELMpb : public PhysicsModel { | |||||
| vacuum_trans *= pnorm; | ||||||
|
|
||||||
| // Transitions from 0 in core to 1 in vacuum | ||||||
| Field2D tanh_res = tanh((P0 - vacuum_pressure) / vacuum_trans); | ||||||
| vac_mask = (1.0 - tanh_res) / 2.0; | ||||||
|
|
||||||
| if (spitzer_resist) { | ||||||
| // Use Spitzer resistivity | ||||||
|
|
@@ -1169,7 +1170,7 @@ class ELMpb : public PhysicsModel { | |||||
| // Only if not restarting: Check initial perturbation | ||||||
|
|
||||||
| // Set U to zero where P0 < vacuum_pressure | ||||||
| U = where(Field2D{P0 - vacuum_pressure}, U, 0.0); | ||||||
|
Contributor
There was a problem hiding this comment. warning: no header providing "where" is directly included [misc-include-cleaner] examples/elm-pb-outerloop/elm_pb_outerloop.cxx:13: - #define DISABLE_RAJA 0 // Turn off RAJA in this file?
+ #include "bout/where.hxx"
+ #define DISABLE_RAJA 0 // Turn off RAJA in this file? |
||||||
|
|
||||||
| if (constn0) { | ||||||
| ubyn = U; | ||||||
|
|
@@ -1796,7 +1797,8 @@ class ELMpb : public PhysicsModel { | |||||
| ddt(U) -= 0.5 * Upara2 * bracket(Pi0, Dperp2Phi, bm_exb) / B0; | ||||||
| Field3D B0phi = B0 * phi; | ||||||
| mesh->communicate(B0phi); | ||||||
| Field2D res = B0 * phi0; | ||||||
|
Contributor
There was a problem hiding this comment. warning: variable 'res' of type 'Field2D' can be declared 'const' [misc-const-correctness]
Suggested change
|
||||||
| Field3D B0phi0 = res; | ||||||
| mesh->communicate(B0phi0); | ||||||
| ddt(U) += 0.5 * Upara2 * bracket(B0phi, Dperp2Pi0, bm_exb) / B0; | ||||||
| ddt(U) += 0.5 * Upara2 * bracket(B0phi0, Dperp2Pi, bm_exb) / B0; | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,16 +6,22 @@ | |
| *******************************************************************************/ | ||
|
|
||
| #include <bout/bout.hxx> | ||
| #include <bout/bout_types.hxx> | ||
| #include <bout/boutexception.hxx> | ||
| #include <bout/constants.hxx> | ||
| #include <bout/coordinates.hxx> | ||
| #include <bout/derivs.hxx> | ||
| #include <bout/difops.hxx> | ||
| #include <bout/field2d.hxx> | ||
| #include <bout/field3d.hxx> | ||
| #include <bout/field_factory.hxx> | ||
| #include <bout/fv_ops.hxx> | ||
| #include <bout/initialprofiles.hxx> | ||
| #include <bout/interpolation.hxx> | ||
| #include <bout/invert/laplacexy.hxx> | ||
| #include <bout/invert_laplace.hxx> | ||
| #include <bout/invert_parderiv.hxx> | ||
| #include <bout/output.hxx> | ||
| #include <bout/sourcex.hxx> | ||
| #include <bout/tokamak_coordinates.hxx> | ||
| #include <bout/utils.hxx> | ||
|
|
@@ -246,8 +252,8 @@ class ELMpb : public PhysicsModel { | |
| std::unique_ptr<Laplacian> phiSolver{nullptr}; | ||
| std::unique_ptr<Laplacian> aparSolver{nullptr}; | ||
|
|
||
| Field2D N0tanh(BoutReal n0_height, BoutReal n0_ave, BoutReal n0_width, | ||
| BoutReal n0_center, BoutReal n0_bottom_x) { | ||
| Field2D result; | ||
| result.allocate(); | ||
|
|
||
|
|
@@ -1138,7 +1144,7 @@ class ELMpb : public PhysicsModel { | |
| // Only if not restarting: Check initial perturbation | ||
|
|
||
| // Set U to zero where P0 < vacuum_pressure | ||
| U = where(Field2D{P0 - vacuum_pressure}, U, 0.0); | ||
|
Contributor
There was a problem hiding this comment. warning: no header providing "where" is directly included [misc-include-cleaner] examples/elm-pb/elm_pb.cxx:7: - #include <bout/bout.hxx>
+ #include "bout/where.hxx"
+ #include <bout/bout.hxx> |
||
|
|
||
| if (constn0) { | ||
| ubyn = U; | ||
|
|
@@ -1202,7 +1208,7 @@ class ELMpb : public PhysicsModel { | |
| // Perform communications | ||
| mesh->communicate(comms); | ||
|
|
||
| const Coordinates* metric = mesh->getCoordinates(); | ||
|
|
||
| //////////////////////////////////////////// | ||
| // Transitions from 0 in core to 1 in vacuum | ||
|
|
@@ -1698,10 +1704,10 @@ class ELMpb : public PhysicsModel { | |
| // Vacuum solution | ||
| if (relax_j_vac) { | ||
| // Calculate the J and Psi profile we're aiming for | ||
| const Field3D Jtarget = Jpar * (1.0 - vac_mask); // Zero in vacuum | ||
|
|
||
| // Invert laplacian for Psi | ||
| const Field3D Psitarget = aparSolver->solve(Jtarget); | ||
|
|
||
| // Add a relaxation term in the vacuum | ||
| ddt(Psi) = | ||
|
|
@@ -1832,7 +1838,7 @@ class ELMpb : public PhysicsModel { | |
| ddt(U) -= 0.5 * Upara2 * bracket(Pi0, Dperp2Phi, bm_exb) / B0; | ||
| Field3D B0phi = B0 * phi; | ||
| mesh->communicate(B0phi); | ||
| Field2D B0phi0 = B0 * phi0; | ||
| mesh->communicate(B0phi0); | ||
| ddt(U) += 0.5 * Upara2 * bracket(B0phi, Dperp2Pi0, bm_exb) / B0; | ||
| ddt(U) += 0.5 * Upara2 * bracket(B0phi0, Dperp2Pi, bm_exb) / B0; | ||
|
|
||
Submodule cpptrace
updated
43 files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,8 +1,8 @@ | ||||||
| /************************************************************************** | ||||||
| * Copyright 2010 - 2026 BOUT++ contributors | ||||||
| * | ||||||
| * Contact Ben Dudson, dudson2@llnl.gov | ||||||
| * | ||||||
| * This file is part of BOUT++. | ||||||
| * | ||||||
| * BOUT++ is free software: you can redistribute it and/or modify | ||||||
|
|
@@ -22,6 +22,8 @@ | |||||
| #ifndef BOUT_TYPES_H | ||||||
| #define BOUT_TYPES_H | ||||||
|
|
||||||
| #include "bout/build_config.hxx" | ||||||
|
|
||||||
| #include <limits> | ||||||
| #include <string> | ||||||
|
|
||||||
|
|
@@ -140,4 +142,15 @@ struct enumWrapper { | |||||
| /// Boundary condition function | ||||||
| using FuncPtr = BoutReal (*)(BoutReal t, BoutReal x, BoutReal y, BoutReal z); | ||||||
|
|
||||||
| template <typename T> | ||||||
| struct Constant { | ||||||
| T val; | ||||||
| struct View { | ||||||
| T v; | ||||||
| View(T v) : v(v) {} | ||||||
| BOUT_HOST_DEVICE T operator()(int) const { return v; } | ||||||
|
Contributor
There was a problem hiding this comment. warning: all parameters should be named in a function [readability-named-parameter]
Suggested change
|
||||||
| }; | ||||||
| operator View() const { return {val}; } | ||||||
| }; | ||||||
|
|
||||||
| #endif // BOUT_TYPES_H | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ | |
| /// -> If Coordinates data is changed, the cache should be cleared | ||
| /// by calling CoordinatesAccessor::clear() | ||
| struct CoordinatesAccessor { | ||
| CoordinatesAccessor() {} | ||
|
Contributor
There was a problem hiding this comment. warning: constructor does not initialize these fields: data, mesh_nz [cppcoreguidelines-pro-type-member-init] include/bout/coordinates_accessor.hxx:87: - BoutReal* data;
- int mesh_nz; ///< For converting from 3D to 2D index
+ BoutReal* data{};
+ int mesh_nz{}; ///< For converting from 3D to 2D index |
||
|
|
||
| /// Constructor from Coordinates | ||
| /// Copies data from coords, doesn't modify it | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
warning: variable 'tanh_res' of type 'Field2D' can be declared 'const' [misc-const-correctness]