Skip to content

Commit c7ac125

Browse files
zingalezingale
authored
fix compilation with amrex::Font (#1517)
something changed upstream that we need to be more explicit now
1 parent d255438 commit c7ac125

7 files changed

+24
-10
lines changed

‎integration/BackwardEuler/actual_integrator.H

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef actual_integrator_H
22
#define actual_integrator_H
33

4+
#include <AMReX_Print.H>
5+
46
#include <iomanip>
57

68
#include <network.H>
@@ -162,7 +164,7 @@ void actual_integrator (BurnT& state, const amrex::Real dt, bool is_retry=false)
162164
if (!state.success) {
163165
if (istate != IERR_ENTERED_NSE) {
164166
#ifndef AMREX_USE_GPU
165-
std::cout << Font::Bold << FGColor::Red << "[ERROR] integration failed in net" << ResetDisplay << std::endl;
167+
std::cout << amrex::Font::Bold << amrex::FGColor::Red << "[ERROR] integration failed in net" << amrex::ResetDisplay << std::endl;
166168
std::cout << "istate = " << istate << std::endl;
167169
if (istate == IERR_SUCCESS) {
168170
std::cout << " BE exited successfully, but a check on the data values failed" << std::endl;

‎integration/BackwardEuler/actual_integrator_sdc.H

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef actual_integrator_H
22
#define actual_integrator_H
33

4+
#include <AMReX_Print.H>
5+
46
#include <iomanip>
57

68
#include <be_type.H>
@@ -173,7 +175,7 @@ void actual_integrator (BurnT& state, const amrex::Real dt, bool is_retry=false)
173175
if (!state.success) {
174176
if (istate != IERR_ENTERED_NSE) {
175177
#ifndef AMREX_USE_GPU
176-
std::cout << Font::Bold << FGColor::Red << "[ERROR] integration failed in net" << ResetDisplay << std::endl;
178+
std::cout << amrex::Font::Bold << amrex::FGColor::Red << "[ERROR] integration failed in net" << amrex::ResetDisplay << std::endl;
177179
std::cout << "istate = " << istate << std::endl;
178180
if (istate == IERR_SUCCESS) {
179181
std::cout << " BE exited successfully, but a check on the data values failed" << std::endl;

‎integration/RKC/actual_integrator.H

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef actual_integrator_H
22
#define actual_integrator_H
33

4+
#include <AMReX_Print.H>
5+
46
#include <iomanip>
57

68
#include <network.H>
@@ -160,7 +162,7 @@ void actual_integrator (BurnT& state, amrex::Real dt, bool is_retry=false)
160162
if (!state.success) {
161163
if (istate != IERR_ENTERED_NSE) {
162164
#ifndef AMREX_USE_GPU
163-
std::cout << Font::Bold << FGColor::Red << "[ERROR] integration failed in net" << ResetDisplay << std::endl;
165+
std::cout << amrex::Font::Bold << amrex::FGColor::Red << "[ERROR] integration failed in net" << amrex::ResetDisplay << std::endl;
164166
std::cout << "istate = " << istate << std::endl;
165167
if (istate == IERR_SUCCESS) {
166168
std::cout << " RKC exited successfully, but a check on the data values failed" << std::endl;

‎integration/RKC/actual_integrator_sdc.H

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef actual_integrator_H
22
#define actual_integrator_H
33

4+
#include <AMReX_Print.H>
5+
46
#include <iomanip>
57

68
#include <network.H>
@@ -173,7 +175,7 @@ void actual_integrator (BurnT& state, amrex::Real dt, bool is_retry=false)
173175
if (!state.success) {
174176
if (istate != IERR_ENTERED_NSE) {
175177
#ifndef AMREX_USE_GPU
176-
std::cout << Font::Bold << FGColor::Red << "[ERROR] integration failed in net" << ResetDisplay << std::endl;
178+
std::cout << amrex::Font::Bold << amrex::FGColor::Red << "[ERROR] integration failed in net" << amrex::ResetDisplay << std::endl;
177179
std::cout << "istate = " << istate << std::endl;
178180
if (istate == IERR_SUCCESS) {
179181
std::cout << " RKC exited successfully, but a check on the data values failed" << std::endl;

‎integration/VODE/actual_integrator.H

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
// Common variables and routines for burners
55
// that use VODE for their integration.
66

7+
#include <AMReX_Print.H>
8+
79
#include <iomanip>
810

911
#include <network.H>
@@ -174,7 +176,7 @@ void actual_integrator (BurnT& state, amrex::Real dt, bool is_retry=false)
174176
if (!state.success) {
175177
if (istate != IERR_ENTERED_NSE) {
176178
#ifndef AMREX_USE_GPU
177-
std::cout << Font::Bold << FGColor::Red << "[ERROR] integration failed in net" << ResetDisplay << std::endl;
179+
std::cout << amrex::Font::Bold << amrex::FGColor::Red << "[ERROR] integration failed in net" << amrex::ResetDisplay << std::endl;
178180
std::cout << "istate = " << istate << std::endl;
179181
if (istate == IERR_SUCCESS) {
180182
std::cout << " VODE exited successfully, but a check on the data values failed" << std::endl;

‎integration/VODE/actual_integrator_sdc.H

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
// Common variables and routines for burners
55
// that use VODE for their integration.
66

7+
#include <AMReX_Print.H>
8+
79
#include <iomanip>
810

911
#include <network.H>
@@ -185,7 +187,7 @@ void actual_integrator (BurnT& state, amrex::Real dt, bool is_retry=false)
185187
if (!state.success) {
186188
if (istate != IERR_ENTERED_NSE) {
187189
#ifndef AMREX_USE_GPU
188-
std::cout << Font::Bold << FGColor::Red << "[ERROR] integration failed in net" << ResetDisplay << std::endl;
190+
std::cout << amrex::Font::Bold << amrex::FGColor::Red << "[ERROR] integration failed in net" << amrex::ResetDisplay << std::endl;
189191
std::cout << "istate = " << istate << std::endl;
190192
if (istate == IERR_SUCCESS) {
191193
std::cout << " VODE exited successfully, but a check on the data values failed" << std::endl;

‎integration/VODE/vode_dvode.H

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef VODE_DVODE_H
22
#define VODE_DVODE_H
33

4+
#include <AMReX_REAL.H>
5+
46
#include <vode_type.H>
57
#include <vode_dvhin.H>
68
#include <vode_dvstep.H>
@@ -130,7 +132,7 @@ int dvode (BurnT& state, DvodeT& vstate)
130132
if (vstate.NST >= ode_max_steps) {
131133
// The maximum number of steps was taken before reaching TOUT.
132134
#ifndef AMREX_USE_GPU
133-
std::cout << Font::Bold << FGColor::Red << "DVODE: maximum number of steps taken before reaching TOUT" << ResetDisplay << std::endl;
135+
std::cout << amrex::Font::Bold << amrex::FGColor::Red << "DVODE: maximum number of steps taken before reaching TOUT" << amrex::ResetDisplay << std::endl;
134136
#endif
135137
for (int i = 1; i <= int_neqs; ++i) {
136138
vstate.y(i) = vstate.yh(i,1);
@@ -164,7 +166,7 @@ int dvode (BurnT& state, DvodeT& vstate)
164166

165167
if (vstate.NST == 0) {
166168
#ifndef AMREX_USE_GPU
167-
std::cout << Font::Bold << FGColor::Red << "DVODE: too much accuracy requested at start of integration" << ResetDisplay << std::endl;
169+
std::cout << amrex::Font::Bold << amrex::FGColor::Red << "DVODE: too much accuracy requested at start of integration" << amrex::ResetDisplay << std::endl;
168170
#endif
169171
return IERR_TOO_MUCH_ACCURACY_REQUESTED;
170172
}
@@ -191,7 +193,7 @@ int dvode (BurnT& state, DvodeT& vstate)
191193
if (kflag == -1) {
192194
// Error test failed repeatedly or with ABS(H) = HMIN.
193195
#ifndef AMREX_USE_GPU
194-
std::cout << Font::Bold << FGColor::Red << "DVODE: error test failed repeatedly or with abs(H) = HMIN" << ResetDisplay << std::endl;
196+
std::cout << amrex::Font::Bold << amrex::FGColor::Red << "DVODE: error test failed repeatedly or with abs(H) = HMIN" << amrex::ResetDisplay << std::endl;
195197
#endif
196198
// Set Y array, T, and optional output.
197199
for (int i = 1; i <= int_neqs; ++i) {
@@ -205,7 +207,7 @@ int dvode (BurnT& state, DvodeT& vstate)
205207
else if (kflag == -2) {
206208
// Convergence failed repeatedly or with ABS(H) = HMIN.
207209
#ifndef AMREX_USE_GPU
208-
std::cout << Font::Bold << FGColor::Red << "DVODE: corrector convergence failed repeatedly or with abs(H) = HMIN" << ResetDisplay << std::endl;
210+
std::cout << amrex::Font::Bold << amrex::FGColor::Red << "DVODE: corrector convergence failed repeatedly or with abs(H) = HMIN" << amrex::ResetDisplay << std::endl;
209211
#endif
210212
// Set Y array, T, and optional output.
211213
for (int i = 1; i <= int_neqs; ++i) {

0 commit comments

Comments
 (0)