Skip to content

Commit

Permalink
Fix linting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbrus89
sbrus89 committed Oct 26, 2024
1 parent 71c583a commit 592e1a9
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 30 deletions.
22 changes: 11 additions & 11 deletions components/omega/src/ocn/OceanState.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ OceanState::OceanState(
LayerThicknessH.resize(NTimeLevels);
NormalVelocityH.resize(NTimeLevels);


for (int I = 0; I < NTimeLevels; I++) {
LayerThicknessH[I] = HostArray2DR8("LayerThickness" + std::to_string(I),
NCellsSize, NVertLevels);
Expand Down Expand Up @@ -315,13 +314,11 @@ void OceanState::defineFields() {

// Associate Field with data
I4 TimeIndex = getTimeIndex(0);
Err = NormalVelocityField->attachData<Array2DR8>(
NormalVelocity[TimeIndex]);
Err = NormalVelocityField->attachData<Array2DR8>(NormalVelocity[TimeIndex]);
if (Err != 0)
LOG_ERROR("Error attaching data array to field {}",
NormalVelocityFldName);
Err = LayerThicknessField->attachData<Array2DR8>(
LayerThickness[TimeIndex]);
Err = LayerThicknessField->attachData<Array2DR8>(LayerThickness[TimeIndex]);
if (Err != 0)
LOG_ERROR("Error attaching data array to field {}",
LayerThicknessFldName);
Expand Down Expand Up @@ -352,9 +349,10 @@ void OceanState::read(int StateFileID, I4 CellDecompR8, I4 EdgeDecompR8) {

I4 Err;

I4 TimeIndex = getTimeIndex(0);

// Read LayerThickness
int LayerThicknessID;
I4 TimeIndex = getTimeIndex(0);
Err = IO::readArray(LayerThicknessH[TimeIndex].data(), NCellsAll,
"layerThickness", StateFileID, CellDecompR8,
LayerThicknessID);
Expand All @@ -373,7 +371,8 @@ void OceanState::read(int StateFileID, I4 CellDecompR8, I4 EdgeDecompR8) {

//------------------------------------------------------------------------------
// Get layer thickness device array
I4 OceanState::getLayerThickness(Array2DReal &LayerThick, const I4 TimeLevel) const {
I4 OceanState::getLayerThickness(Array2DReal &LayerThick,
const I4 TimeLevel) const {
I4 Err = 0;

I4 TimeIndex = getTimeIndex(TimeLevel);
Expand All @@ -396,7 +395,8 @@ I4 OceanState::getLayerThicknessH(HostArray2DReal &LayerThickH,

//------------------------------------------------------------------------------
// Get normal velocity device array
I4 OceanState::getNormalVelocity(Array2DReal &NormVel, const I4 TimeLevel) const {
I4 OceanState::getNormalVelocity(Array2DReal &NormVel,
const I4 TimeLevel) const {

I4 Err = 0;

Expand Down Expand Up @@ -451,8 +451,7 @@ I4 OceanState::exchangeHalo(const I4 TimeLevel) {

copyToHost(TimeLevel);


I4 TimeIndex = getTimeIndex(TimeLevel);
I4 TimeIndex = getTimeIndex(TimeLevel);

MeshHalo->exchangeFullArrayHalo(LayerThicknessH[TimeIndex], OnCell);
MeshHalo->exchangeFullArrayHalo(NormalVelocityH[TimeIndex], OnEdge);
Expand Down Expand Up @@ -526,7 +525,8 @@ I4 OceanState::getTimeIndex(const I4 TimeLevel) const {

// Check if time level is valid
if (TimeLevel > 1 || (TimeLevel + NTimeLevels) <= 1) {
LOG_ERROR("OceanState: Time level {} is out of range {}", TimeLevel, NTimeLevels);
LOG_ERROR("OceanState: Time level {} is out of range {}", TimeLevel,
NTimeLevels);
return -1;
}

Expand Down
3 changes: 2 additions & 1 deletion components/omega/src/ocn/OceanState.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ class OceanState {
I4 getLayerThickness(Array2DReal &LayerThick, const I4 TimeLevel) const;

/// Get layer thickness host array at given time level
I4 getLayerThicknessH(HostArray2DReal &LayerThickH, const I4 TimeLevel) const;
I4 getLayerThicknessH(HostArray2DReal &LayerThickH,
const I4 TimeLevel) const;

/// Get normal velocity device array at given time level
I4 getNormalVelocity(Array2DReal &NormVel, const I4 TimeLevel) const;
Expand Down
2 changes: 1 addition & 1 deletion components/omega/src/ocn/Tracers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ I4 Tracers::updateTimeLevels() {
}

//---------------------------------------------------------------------------
// get index for time level
// get index for time level
// TimeLevel == [1:new, 0:current, -1:previous, -2:two times ago, ...]
//---------------------------------------------------------------------------
I4 Tracers::getTimeIndex(const I4 TimeLevel) {
Expand Down
46 changes: 31 additions & 15 deletions components/omega/test/ocn/StateTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ int initStateTest() {
}

// Check for differences between layer thickness and normal velocity host arrays
int checkHost(OMEGA::OceanState* DefState, OMEGA::OceanState* TestState, int DefLevel, int TestLevel) {
int checkHost(OMEGA::OceanState *DefState, OMEGA::OceanState *TestState,
int DefLevel, int TestLevel) {

int count = 0;
OMEGA::HostArray2DReal LayerThicknessH_def;
Expand Down Expand Up @@ -112,8 +113,10 @@ int checkHost(OMEGA::OceanState* DefState, OMEGA::OceanState* TestState, int Def
return count;
}

// Check for differences between layer thickness and normal velocity device arrays
int checkDevice(OMEGA::OceanState* DefState, OMEGA::OceanState* TestState, int DefLevel, int TestLevel) {
// Check for differences between layer thickness and normal velocity device
// arrays
int checkDevice(OMEGA::OceanState *DefState, OMEGA::OceanState *TestState,
int DefLevel, int TestLevel) {

int count1;
OMEGA::Array2DReal LayerThickness_def;
Expand Down Expand Up @@ -205,10 +208,12 @@ int main(int argc, char *argv[]) {
// Test retrieval of the default state
OMEGA::OceanState *DefState = OMEGA::OceanState::get("Default");
if (DefState) { // true if non-null ptr
LOG_INFO("State: Default state retrieval (NTimeLevels={}) PASS", NTimeLevels);
LOG_INFO("State: Default state retrieval (NTimeLevels={}) PASS",
NTimeLevels);
} else {
RetVal += 1;
LOG_INFO("State: Default state retrieval (NTimeLevels={}) FAIL", NTimeLevels);
LOG_INFO("State: Default state retrieval (NTimeLevels={}) FAIL",
NTimeLevels);
}

// Create "test" state
Expand All @@ -218,10 +223,12 @@ int main(int argc, char *argv[]) {
OMEGA::OceanState *TestState = OMEGA::OceanState::get("Test");

if (TestState) { // true if non-null ptr
LOG_INFO("State: Test state retrieval (NTimeLevels={}) PASS", NTimeLevels);
LOG_INFO("State: Test state retrieval (NTimeLevels={}) PASS",
NTimeLevels);
} else {
RetVal += 1;
LOG_INFO("State: Test state retrieval (NTimeLevels={}) FAIL", NTimeLevels);
LOG_INFO("State: Test state retrieval (NTimeLevels={}) FAIL",
NTimeLevels);
}

// Initially fill test state with the same values as the default state
Expand Down Expand Up @@ -273,10 +280,14 @@ int main(int argc, char *argv[]) {
int count2 = checkDevice(DefState, TestState, CurLevel, CurLevel);

if (count1 + count2 == 0) {
LOG_INFO("State: Default test state comparison (NTimeLevels={}) PASS", NTimeLevels);
LOG_INFO(
"State: Default test state comparison (NTimeLevels={}) PASS",
NTimeLevels);
} else {
RetVal += 1;
LOG_INFO("State: Default test state comparison (NTimeLevels={}) FAIL", NTimeLevels);
LOG_INFO(
"State: Default test state comparison (NTimeLevels={}) FAIL",
NTimeLevels);
}

// Perform time level update.
Expand All @@ -288,14 +299,18 @@ int main(int argc, char *argv[]) {
count2 = checkDevice(DefState, TestState, CurLevel, CurLevel);

if (count1 + count2 != 0) {
LOG_INFO("State: time levels different after single update (NTimeLevels={}) PASS", NTimeLevels);
LOG_INFO("State: time levels different after single update "
"(NTimeLevels={}) PASS",
NTimeLevels);
} else {
RetVal += 1;
LOG_INFO("State: time levels different after single update (NTimeLevels={}) FAIL", NTimeLevels);
LOG_INFO("State: time levels different after single update "
"(NTimeLevels={}) FAIL",
NTimeLevels);
}

// Perform time level updates to cycle back to inital index
for (int i = 0; i < NTimeLevels-1; i++) {
for (int i = 0; i < NTimeLevels - 1; i++) {
DefState->updateTimeLevels();
}

Expand All @@ -305,13 +320,14 @@ int main(int argc, char *argv[]) {
count2 = checkDevice(DefState, TestState, CurLevel, CurLevel);

if (count1 + count2 == 0) {
LOG_INFO("State: time level update (NTimeLevels={}) PASS", NTimeLevels);
LOG_INFO("State: time level update (NTimeLevels={}) PASS",
NTimeLevels);
} else {
RetVal += 1;
LOG_INFO("State: time level update (NTimeLevels={}) FAIL", NTimeLevels);
LOG_INFO("State: time level update (NTimeLevels={}) FAIL",
NTimeLevels);
}


OMEGA::OceanState::clear();
}

Expand Down
4 changes: 2 additions & 2 deletions components/omega/test/timeStepping/TimeStepperTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ struct DecayVelocityTendency {
const AuxiliaryState *AuxState, int ThickTimeLevel,
int VelTimeLevel, TimeInstant Time) const {

auto *Mesh = HorzMesh::getDefault();
auto NVertLevels = NormalVelTend.extent_int(1);
auto *Mesh = HorzMesh::getDefault();
auto NVertLevels = NormalVelTend.extent_int(1);
Array2DReal NormalVelEdge;
State->getNormalVelocity(NormalVelEdge, VelTimeLevel);

Expand Down

0 comments on commit 592e1a9

Please sign in to comment.