Skip to content

Commit

Permalink
Merge pull request #13006 from KratosMultiphysics/thermal-dem-adding-…
Browse files Browse the repository at this point in the history
…pragma-once

Added pragma and formatting
  • Loading branch information
rlrangel authored Jan 14, 2025
2 parents cec2a60 + b8900d9 commit dec7f82
Show file tree
Hide file tree
Showing 40 changed files with 87 additions and 111 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "direct_conduction_bob_complete.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
DirectConductionBOBComplete::DirectConductionBOBComplete() {}
DirectConductionBOBComplete::~DirectConductionBOBComplete() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "direct_conduction_bob_modified.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
DirectConductionBOBModified::DirectConductionBOBModified() {}
DirectConductionBOBModified::~DirectConductionBOBModified() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "direct_conduction_bob_simple.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
DirectConductionBOBSimple::DirectConductionBOBSimple() {}
DirectConductionBOBSimple::~DirectConductionBOBSimple() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "direct_conduction_collision.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
DirectConductionCollision::DirectConductionCollision() {}
DirectConductionCollision::~DirectConductionCollision() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "direct_conduction_model.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
DirectConductionModel::DirectConductionModel() {}
DirectConductionModel::~DirectConductionModel() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "direct_conduction_pipe.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
DirectConductionPipe::DirectConductionPipe() {}
DirectConductionPipe::~DirectConductionPipe() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "indirect_conduction_model.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
IndirectConductionModel::IndirectConductionModel() {}
IndirectConductionModel::~IndirectConductionModel() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "indirect_conduction_surround_layer.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
IndirectConductionSurroundLayer::IndirectConductionSurroundLayer() {}
IndirectConductionSurroundLayer::~IndirectConductionSurroundLayer() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "indirect_conduction_vargas.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
IndirectConductionVargas::IndirectConductionVargas() {}
IndirectConductionVargas::~IndirectConductionVargas() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "indirect_conduction_voronoi_a.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
IndirectConductionVoronoiA::IndirectConductionVoronoiA() {}
IndirectConductionVoronoiA::~IndirectConductionVoronoiA() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "indirect_conduction_voronoi_b.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
IndirectConductionVoronoiB::IndirectConductionVoronoiB() {}
IndirectConductionVoronoiB::~IndirectConductionVoronoiB() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "convection_model.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
ConvectionModel::ConvectionModel() {}
ConvectionModel::~ConvectionModel() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "nusselt_gunn.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
NusseltGunn::NusseltGunn() {}
NusseltGunn::~NusseltGunn() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "nusselt_hanz_marshall.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
NusseltHanzMarshall::NusseltHanzMarshall() {}
NusseltHanzMarshall::~NusseltHanzMarshall() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "nusselt_li_mason.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
NusseltLiMason::NusseltLiMason() {}
NusseltLiMason::~NusseltLiMason() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "nusselt_whitaker.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
NusseltWhitaker::NusseltWhitaker() {}
NusseltWhitaker::~NusseltWhitaker() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "generation_dissipation.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
GenerationDissipation::GenerationDissipation() {}
GenerationDissipation::~GenerationDissipation() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "generation_model.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
GenerationModel::GenerationModel() {}
GenerationModel::~GenerationModel() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "heat_exchange_mechanism.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
HeatExchangeMechanism::HeatExchangeMechanism() {}
HeatExchangeMechanism::~HeatExchangeMechanism() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "heat_generation_mechanism.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
HeatGenerationMechanism::HeatGenerationMechanism() {}
HeatGenerationMechanism::~HeatGenerationMechanism() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "radiation_continuum_krause.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
RadiationContinuumKrause::RadiationContinuumKrause() {}
RadiationContinuumKrause::~RadiationContinuumKrause() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "radiation_continuum_zhou.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
RadiationContinuumZhou::RadiationContinuumZhou() {}
RadiationContinuumZhou::~RadiationContinuumZhou() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "radiation_model.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
RadiationModel::RadiationModel() {}
RadiationModel::~RadiationModel() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "real_contact_lu.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
RealContactLu::RealContactLu() {}
RealContactLu::~RealContactLu() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "thermal_dem_application_variables.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
RealContactModel::RealContactModel() {}
RealContactModel::~RealContactModel() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "real_contact_morris_area.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
RealContactMorrisArea::RealContactMorrisArea() {}
RealContactMorrisArea::~RealContactMorrisArea() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "real_contact_morris_area_time.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
RealContactMorrisAreaTime::RealContactMorrisAreaTime() {}
RealContactMorrisAreaTime::~RealContactMorrisAreaTime() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "real_contact_rangel_area.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
RealContactRangelArea::RealContactRangelArea() {}
RealContactRangelArea::~RealContactRangelArea() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "real_contact_rangel_area_time.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
RealContactRangelAreaTime::RealContactRangelAreaTime() {}
RealContactRangelAreaTime::~RealContactRangelAreaTime() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "real_contact_zhou.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
RealContactZhou::RealContactZhou() {}
RealContactZhou::~RealContactZhou() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "graph_utilities.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
GraphUtilities::GraphUtilities() {
mGraph_ParticleTempMin = false;
mGraph_ParticleTempMax = false;
Expand All @@ -31,7 +31,7 @@ namespace Kratos {

GraphUtilities::~GraphUtilities() {}

//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
void GraphUtilities::ExecuteInitialize(bool ParticleTempMin,
bool ParticleTempMax,
bool ParticleTempAvg,
Expand All @@ -42,8 +42,7 @@ namespace Kratos {
bool EnergyThermal,
bool HeatFluxContributions,
bool HeatGenValues,
bool HeatGenContributions)
{
bool HeatGenContributions) {
KRATOS_TRY

// Set member flags
Expand All @@ -65,7 +64,7 @@ namespace Kratos {
KRATOS_CATCH("")
}

//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
void GraphUtilities::ExecuteFinalizeSolutionStep(ModelPart& rModelPart) {
KRATOS_TRY

Expand All @@ -75,7 +74,7 @@ namespace Kratos {
KRATOS_CATCH("")
}

//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
void GraphUtilities::ExecuteFinalize(void) {
KRATOS_TRY

Expand All @@ -84,7 +83,7 @@ namespace Kratos {
KRATOS_CATCH("")
}

//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
void GraphUtilities::OpenFiles(void) {
if (mGraph_ParticleTempMin) {
mFile_ParticleTempMin.open("graph_particle_temp_min.txt", std::ios::out);
Expand Down Expand Up @@ -206,7 +205,7 @@ namespace Kratos {
}
}

//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
void GraphUtilities::WriteGraphs(ModelPart& rModelPart) {
KRATOS_TRY

Expand Down Expand Up @@ -523,7 +522,7 @@ namespace Kratos {
KRATOS_CATCH("")
}

//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
void GraphUtilities::CloseFiles(void) {
if (mFile_ParticleTempMin.is_open()) mFile_ParticleTempMin.close();
if (mFile_ParticleTempMax.is_open()) mFile_ParticleTempMax.close();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
// Main authors: Rafael Rangel ([email protected])
//

#ifndef GRAPH_UTILITIES_H_INCLUDED
#define GRAPH_UTILITIES_H_INCLUDED
#pragma once

// System includes
#include <iostream>
Expand Down Expand Up @@ -85,5 +84,3 @@ namespace Kratos

}; // Class GraphUtilities
} // namespace Kratos

#endif // GRAPH_UTILITIES_H_INCLUDED
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
#include "heat_map_utilities.h"

namespace Kratos {
//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
HeatMapUtilities::HeatMapUtilities() {}
HeatMapUtilities::~HeatMapUtilities() {}

//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
void HeatMapUtilities::ExecuteInitialize(ModelPart& rModelPart) {
const ProcessInfo& r_process_info = rModelPart.GetProcessInfo();
if (!r_process_info[HEAT_MAP_GENERATION_OPTION])
Expand Down Expand Up @@ -54,7 +54,7 @@ namespace Kratos {
}
}

//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
// ATTENTION: IF NUMBER OF PARTICLES IS CONSTANT, THIS COULD BE DONE ONLY ONCE IN THE END OF ANALYSIS
void HeatMapUtilities::ExecuteFinalizeSolutionStep(ModelPart& rModelPart) {
const ProcessInfo& r_process_info = rModelPart.GetProcessInfo();
Expand Down Expand Up @@ -92,7 +92,7 @@ namespace Kratos {
}
}

//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
void HeatMapUtilities::ExecuteFinalize(ModelPart& rModelPart) {
const ProcessInfo& r_process_info = rModelPart.GetProcessInfo();
if (!r_process_info[HEAT_MAP_GENERATION_OPTION])
Expand Down Expand Up @@ -190,7 +190,7 @@ namespace Kratos {
if (file_generation_rolling_pw.is_open()) file_generation_rolling_pw.close();
}

//-----------------------------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------------------
void HeatMapUtilities::ResetMap(std::vector<std::vector<std::vector<double>>>& map) {
for (int i = 0; i < mDimX; i++) {
std::vector<std::vector<double>> vv;
Expand Down
Loading

0 comments on commit dec7f82

Please sign in to comment.