Some more examples fixes #2951

tomc271 · 2024-07-29T15:34:54Z

A couple of lines are just commented-out rather than deleted -- please delete them if appropriate (or let me know so that I will).

dschwoerer · 2024-07-29T15:36:54Z

See #2950 for comments

github-actions · 2024-07-29T15:44:10Z

clang-tidy review says "All clean, LGTM! 👍"

examples/2Dturbulence_multigrid/esel.cxx

examples/subsampling/monitor.cxx

github-actions

clang-tidy made some suggestions

examples/performance/bracket/bracket.cxx

examples/performance/ddx/ddx.cxx

examples/performance/ddy/ddy.cxx

examples/performance/ddz/ddz.cxx

examples/performance/iterator-offsets/iterator-offsets.cxx

examples/performance/iterator/iterator.cxx

examples/performance/laplace/laplace.cxx

examples/performance/tuning_regionblocksize/tuning_regionblocksize.cxx

src/bout++.cxx

github-actions

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 67. Check the log or trigger a new build to see more.

github-actions · 2024-09-16T11:36:24Z

examples/2Dturbulence_multigrid/esel.cxx

+#include <bout/physicsmodel.hxx>
+#include <bout/smoothing.hxx>
+
+class ESEL : public PhysicsModel {


warning: constructor does not initialize these fields: D, mu, zeta, bm [cppcoreguidelines-pro-type-member-init]

examples/2Dturbulence_multigrid/esel.cxx:12:

- BoutReal D, mu; // Diffusion coefficients + BoutReal D{}, mu{}; // Diffusion coefficients

examples/2Dturbulence_multigrid/esel.cxx:14:

- BoutReal zeta; // rho/R0 + BoutReal zeta{}; // rho/R0

github-actions · 2024-09-16T11:36:24Z

examples/2Dturbulence_multigrid/esel.cxx

+  Field3D vort_error;
+
+protected:
+  int init(bool UNUSED(restart)) {


warning: annotate this function with 'override' or (rarely) 'final' [cppcoreguidelines-explicit-virtual-functions]

Suggested change

int init(bool UNUSED(restart)) {

int init(bool UNUSED(restart)) override {

github-actions · 2024-09-16T11:36:24Z

examples/2Dturbulence_multigrid/esel.cxx

+    return 0;
+  }
+
+  Field3D C(const Field3D& f) { return zeta * DDZ(f); }


warning: method 'C' can be made const [readability-make-member-function-const]

Suggested change

Field3D C(const Field3D& f) { return zeta * DDZ(f); }

Field3D C(const Field3D& f) const { return zeta * DDZ(f); }

github-actions · 2024-09-16T11:36:24Z

examples/2Dturbulence_multigrid/esel.cxx

+
+  Field3D C(const Field3D& f) { return zeta * DDZ(f); }
+
+  int rhs(BoutReal UNUSED(time)) {


warning: annotate this function with 'override' or (rarely) 'final' [cppcoreguidelines-explicit-virtual-functions]

Suggested change

int rhs(BoutReal UNUSED(time)) {

int rhs(BoutReal UNUSED(time)) override {

github-actions · 2024-09-16T11:36:24Z

examples/2Dturbulence_multigrid/esel.cxx

+  }
+};
+
+BOUTMAIN(ESEL);


warning: variable 'init_err' of type 'int' can be declared 'const' [misc-const-correctness]

BOUTMAIN(ESEL); ^

Additional context

include/bout/physicsmodel.hxx:420: expanded from macro 'BOUTMAIN'

int init_err = BoutInitialise(argc, argv); \ ^

github-actions · 2024-09-16T11:36:25Z

examples/fci-wave-logn/fci-wave.cxx

+
+        for (reg->first(); !reg->isDone(); reg->next()) {
+          BoutReal n_b = exp(0.5
+                             * (logn_next(reg->x, reg->y + reg->dir, reg->z)


warning: no member named 'z' in 'BoundaryRegionPar' [clang-diagnostic-error]

* (logn_next(reg->x, reg->y + reg->dir, reg->z) ^

github-actions · 2024-09-16T11:36:25Z

examples/fci-wave-logn/fci-wave.cxx

+        for (reg->first(); !reg->isDone(); reg->next()) {
+          BoutReal n_b = exp(0.5
+                             * (logn_next(reg->x, reg->y + reg->dir, reg->z)
+                                + logn(reg->x, reg->y, reg->z)));


warning: no member named 'x' in 'BoundaryRegionPar' [clang-diagnostic-error]

+ logn(reg->x, reg->y, reg->z))); ^

github-actions · 2024-09-16T11:36:25Z

examples/fci-wave-logn/fci-wave.cxx

+        for (reg->first(); !reg->isDone(); reg->next()) {
+          BoutReal n_b = exp(0.5
+                             * (logn_next(reg->x, reg->y + reg->dir, reg->z)
+                                + logn(reg->x, reg->y, reg->z)));


warning: no member named 'y' in 'BoundaryRegionPar' [clang-diagnostic-error]

+ logn(reg->x, reg->y, reg->z))); ^

github-actions · 2024-09-16T11:36:26Z

examples/fci-wave-logn/fci-wave.cxx

+        for (reg->first(); !reg->isDone(); reg->next()) {
+          BoutReal n_b = exp(0.5
+                             * (logn_next(reg->x, reg->y + reg->dir, reg->z)
+                                + logn(reg->x, reg->y, reg->z)));


warning: no member named 'z' in 'BoundaryRegionPar' [clang-diagnostic-error]

+ logn(reg->x, reg->y, reg->z))); ^

github-actions · 2024-09-16T11:36:26Z

examples/fci-wave-logn/fci-wave.cxx

+                                + logn(reg->x, reg->y, reg->z)));
+          BoutReal v_b =
+              0.5
+              * (v_next(reg->x, reg->y + reg->dir, reg->z) + v(reg->x, reg->y, reg->z));


warning: no member named 'x' in 'BoundaryRegionPar' [clang-diagnostic-error]

* (v_next(reg->x, reg->y + reg->dir, reg->z) + v(reg->x, reg->y, reg->z)); ^

…ch next-options-nocopy.

…x, y, z).

github-actions · 2024-09-16T11:59:48Z

clang-tidy review says "All clean, LGTM! 👍"

Use reference to Options (not a copy). Required since changes in branch next-options-nocopy.

github-actions · 2024-09-16T13:21:08Z

clang-tidy review says "All clean, LGTM! 👍"

tomc271 requested a review from ZedThree July 29, 2024 15:35

ZedThree reviewed Jul 30, 2024

View reviewed changes

examples/2Dturbulence_multigrid/esel.cxx Outdated Show resolved Hide resolved

ZedThree reviewed Jul 30, 2024

View reviewed changes

examples/subsampling/monitor.cxx Outdated Show resolved Hide resolved

github-actions bot reviewed Aug 23, 2024

View reviewed changes

ZedThree force-pushed the fix-examples branch from 924ca0a to 5fe6896 Compare September 11, 2024 16:23

Add missing argument in call to writeDefaultOutputFile().

2ff41ff

tomc271 force-pushed the fix_examples_extra branch from 675b706 to 8573ed1 Compare September 16, 2024 11:26

github-actions bot reviewed Sep 16, 2024

View reviewed changes

tomchapman and others added 10 commits September 16, 2024 12:39

fci-wave example needs to include "bout/parallel_boundary_region.hxx".

e86a7cb

Add missing argument in call to writeDefaultOutputFile().

e4faaa8

Remove 'shim' header file - options_netcdf.hxx no longer exists.

55d887c

Use OptionsIOFactory instead of OptionsNetCDF for output_file.

926b9b0

Fix "Use OptionsIOFactory instead of OptionsNetCDF for output_file".

9b401b5

Use reference to Options (not a copy). Required since changes in bran…

1c5387c

…ch next-options-nocopy.

Apply clang-format changes

eecc813

Fix examples/fci-wave (BoundaryRegionPar no longer has public fields …

d72d11c

…x, y, z).

Uncomment output_file->write(output) in examples/subsampling/monitor.cxx

bfee7ae

Revert change to reference for 'datadir'.

8e0d6e6

tomc271 force-pushed the fix_examples_extra branch from ba73cef to 21a3b6e Compare September 16, 2024 11:48

Apply clang-format changes

6120ef2

tomc271 force-pushed the fix_examples_extra branch from 7ef021e to 6120ef2 Compare September 16, 2024 11:51

Fix "call to deleted constructor of 'Options' [clang-diagnostic-error]"

e78374b

Use reference to Options (not a copy). Required since changes in branch next-options-nocopy.

ZedThree approved these changes Sep 18, 2024

View reviewed changes

ZedThree changed the title ~~Fix examples extra~~ Some more examples fixes Sep 18, 2024

ZedThree merged commit 30ed12c into fix-examples Sep 18, 2024
11 of 27 checks passed

ZedThree deleted the fix_examples_extra branch September 18, 2024 15:48

	int init(bool UNUSED(restart)) {
	int init(bool UNUSED(restart)) override {

	Field3D C(const Field3D& f) { return zeta * DDZ(f); }
	Field3D C(const Field3D& f) const { return zeta * DDZ(f); }


		Field3D C(const Field3D& f) { return zeta * DDZ(f); }

		int rhs(BoutReal UNUSED(time)) {

	int rhs(BoutReal UNUSED(time)) {
	int rhs(BoutReal UNUSED(time)) override {

Some more examples fixes #2951

Some more examples fixes #2951

Uh oh!

Conversation

tomc271 commented Jul 29, 2024

Uh oh!

dschwoerer commented Jul 29, 2024

Uh oh!

github-actions bot commented Jul 29, 2024

Uh oh!

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 16, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Sep 16, 2024

Uh oh!

github-actions bot commented Sep 16, 2024

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants