Skip to content

Commit c152fa3

Browse files
pcarruscagpcarruscag
committed
move files
1 parent a00bce2 commit c152fa3

24 files changed

Lines changed: 135 additions & 134 deletions

Common/include/fem_cgns_elements.hpp renamed to Common/include/fem/fem_cgns_elements.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* SU2 Project Website: https://su2code.github.io
1010
*
11-
* The SU2 Project is maintained by the SU2 Foundation
11+
* The SU2 Project is maintained by the SU2 Foundation
1212
* (http://su2foundation.org)
1313
*
1414
* Copyright 2012-2020, SU2 Contributors (cf. AUTHORS.md)
@@ -29,13 +29,13 @@
2929

3030
#pragma once
3131

32-
#include "./mpi_structure.hpp"
32+
#include "../mpi_structure.hpp"
3333

3434
#ifdef HAVE_CGNS
3535
#include "cgnslib.h"
3636
#endif
3737

38-
#include "geometry/primal_grid/CPrimalGridFEM.hpp"
38+
#include "../geometry/primal_grid/CPrimalGridFEM.hpp"
3939

4040
/* Forward declaration of CBoundaryFace to avoid problems. */
4141
class CBoundaryFace;

Common/include/fem_gauss_jacobi_quadrature.hpp renamed to Common/include/fem/fem_gauss_jacobi_quadrature.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Tom
8686
#include <cstdlib>
8787
#include <vector>
8888

89-
#include "CConfig.hpp"
89+
#include "../CConfig.hpp"
9090

9191
using namespace std;
9292

Common/include/fem_geometry_structure.hpp renamed to Common/include/fem/fem_geometry_structure.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828

2929
#pragma once
3030

31-
#include "geometry/CGeometry.hpp"
31+
#include "../geometry/CGeometry.hpp"
3232
#include "fem_standard_element.hpp"
3333
#ifdef HAVE_CGNS
3434
#include "fem_cgns_elements.hpp"
3535
#endif
36-
#include "wall_model.hpp"
37-
#include "blas_structure.hpp"
36+
#include "../wall_model.hpp"
37+
#include "../blas_structure.hpp"
3838

3939
using namespace std;
4040

Common/include/fem_standard_element.hpp renamed to Common/include/fem/fem_standard_element.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <vector>
3333
#include <cstdlib>
3434

35-
#include "CConfig.hpp"
35+
#include "../CConfig.hpp"
3636

3737
using namespace std;
3838

Common/include/geometry_structure_fem_part.hpp renamed to Common/include/fem/geometry_structure_fem_part.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#pragma once
2929

30-
#include "datatype_structure.hpp"
30+
#include "../datatype_structure.hpp"
3131

3232
#include <vector>
3333
#include <algorithm>

‎Common/include/geometry/CGeometry.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ extern "C" {
5959
#include "dual_grid/CTurboVertex.hpp"
6060

6161
#include "../CConfig.hpp"
62-
#include "../geometry_structure_fem_part.hpp"
62+
#include "../fem/geometry_structure_fem_part.hpp"
6363
#include "../toolboxes/graph_toolbox.hpp"
6464
#include "../adt_structure.hpp"
6565

‎Common/lib/Makefile.am‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,22 @@ noinst_LIBRARIES += libSU2_AD.a
4545
endif
4646

4747
lib_sources = \
48-
../src/fem_cgns_elements.cpp \
48+
../src/fem/fem_cgns_elements.cpp \
4949
../src/CConfig.cpp \
5050
../src/blas_structure.cpp \
51-
../src/fem_geometry_structure.cpp \
52-
../src/fem_integration_rules.cpp \
53-
../src/fem_standard_element.cpp \
54-
../src/fem_wall_distance.cpp \
55-
../src/fem_work_estimate_metis.cpp \
51+
../src/fem/fem_geometry_structure.cpp \
52+
../src/fem/fem_integration_rules.cpp \
53+
../src/fem/fem_standard_element.cpp \
54+
../src/fem/fem_wall_distance.cpp \
55+
../src/fem/fem_work_estimate_metis.cpp \
5656
../src/CMultiGridQueue.cpp \
57-
../src/geometry_structure_fem_part.cpp \
57+
../src/fem/geometry_structure_fem_part.cpp \
5858
../src/graph_coloring_structure.cpp \
5959
../src/grid_adaptation_structure.cpp \
6060
../src/grid_movement_structure.cpp \
6161
../src/mpi_structure.cpp \
6262
../src/ad_structure.cpp \
63-
../src/fem_gauss_jacobi_quadrature.cpp \
63+
../src/fem/fem_gauss_jacobi_quadrature.cpp \
6464
../src/geometry/CGeometry.cpp \
6565
../src/geometry/CPhysicalGeometry.cpp \
6666
../src/geometry/CMultiGridGeometry.cpp \

‎Common/src/CConfig.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#include "../include/CConfig.hpp"
3030
#undef ENABLE_MAPS
3131

32-
#include "../include/fem_gauss_jacobi_quadrature.hpp"
33-
#include "../include/fem_geometry_structure.hpp"
32+
#include "../include/fem/fem_gauss_jacobi_quadrature.hpp"
33+
#include "../include/fem/fem_geometry_structure.hpp"
3434

3535
#include "../include/ad_structure.hpp"
3636
#include "../include/toolboxes/printing_toolbox.hpp"
@@ -80,13 +80,13 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
8080
/*--- Parsing the config file ---*/
8181

8282
SetConfig_Parsing(case_filename);
83-
83+
8484
/*--- Set the default values for all of the options that weren't set ---*/
85-
85+
8686
SetDefault();
87-
87+
8888
/*--- Set number of zone ---*/
89-
89+
9090
SetnZone();
9191

9292
/*--- Configuration file postprocessing ---*/
@@ -105,7 +105,7 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
105105
}
106106

107107
CConfig::CConfig(istream &case_buffer, unsigned short val_software, bool verb_high) {
108-
108+
109109
base_config = true;
110110

111111
iZone = 0;
@@ -116,7 +116,7 @@ CConfig::CConfig(istream &case_buffer, unsigned short val_software, bool verb_hi
116116
/*--- Parsing the config file ---*/
117117

118118
SetConfig_Parsing(case_buffer);
119-
119+
120120
/*--- Set the default values for all of the options that weren't set ---*/
121121

122122
SetDefault();
@@ -142,7 +142,7 @@ CConfig::CConfig(istream &case_buffer, unsigned short val_software, bool verb_hi
142142

143143

144144
CConfig::CConfig(CConfig* config, char case_filename[MAX_STRING_SIZE], unsigned short val_software, unsigned short val_iZone, unsigned short val_nZone, bool verb_high) {
145-
145+
146146
caseName = config->GetCaseName();
147147

148148
unsigned short val_nDim;
@@ -151,7 +151,7 @@ CConfig::CConfig(CConfig* config, char case_filename[MAX_STRING_SIZE], unsigned
151151

152152
iZone = val_iZone;
153153
nZone = val_nZone;
154-
154+
155155
Init();
156156

157157
/*--- Parsing the config file ---*/
@@ -197,9 +197,9 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], unsigned short val_softwar
197197

198198
nZone = 1;
199199
iZone = 0;
200-
200+
201201
Init();
202-
202+
203203
/*--- Parsing the config file ---*/
204204

205205
SetConfig_Parsing(case_filename);
@@ -233,7 +233,7 @@ CConfig::CConfig(char case_filename[MAX_STRING_SIZE], CConfig *config) {
233233
caseName = PrintingToolbox::split(string(case_filename),'.')[0];
234234

235235
base_config = true;
236-
236+
237237
bool runtime_file = false;
238238

239239
Init();
@@ -261,20 +261,20 @@ SU2_MPI::Comm CConfig::GetMPICommunicator() {
261261
}
262262

263263
void CConfig::Init(){
264-
265-
/*--- Store MPI rank and size ---*/
266-
264+
265+
/*--- Store MPI rank and size ---*/
266+
267267
rank = SU2_MPI::GetRank();
268268
size = SU2_MPI::GetSize();
269-
269+
270270
/*--- Initialize pointers to Null---*/
271271

272272
SetPointersNull();
273273

274274
/*--- Reading config options ---*/
275275

276276
SetConfig_Options();
277-
277+
278278
}
279279

280280
void CConfig::SetMPICommunicator(SU2_MPI::Comm Communicator) {
@@ -2808,25 +2808,25 @@ void CConfig::SetConfig_Options() {
28082808
}
28092809

28102810
void CConfig::SetConfig_Parsing(char case_filename[MAX_STRING_SIZE]) {
2811-
2811+
28122812
ifstream case_file;
2813-
2813+
28142814
/*--- Read the configuration file ---*/
28152815

28162816
case_file.open(case_filename, ios::in);
28172817

28182818
if (case_file.fail()) {
28192819
SU2_MPI::Error("The configuration file (.cfg) is missing!!", CURRENT_FUNCTION);
28202820
}
2821-
2821+
28222822
SetConfig_Parsing(case_file);
2823-
2823+
28242824
case_file.close();
2825-
2825+
28262826
}
28272827

28282828
void CConfig::SetConfig_Parsing(istream& config_buffer){
2829-
2829+
28302830
string text_line, option_name;
28312831
vector<string> option_value;
28322832

@@ -2838,9 +2838,9 @@ void CConfig::SetConfig_Parsing(char case_filename[MAX_STRING_SIZE]) {
28382838
map<string, bool> included_options;
28392839

28402840
/*--- Parse the configuration file and set the options ---*/
2841-
2841+
28422842
while (getline (config_buffer, text_line)) {
2843-
2843+
28442844
if (err_count >= max_err_count) {
28452845
errorString.append("too many errors. Stopping parse");
28462846

Common/src/fem_cgns_elements.cpp renamed to Common/src/fem/fem_cgns_elements.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* SU2 Project Website: https://su2code.github.io
88
*
9-
* The SU2 Project is maintained by the SU2 Foundation
9+
* The SU2 Project is maintained by the SU2 Foundation
1010
* (http://su2foundation.org)
1111
*
1212
* Copyright 2012-2020, SU2 Contributors (cf. AUTHORS.md)
@@ -26,10 +26,10 @@
2626
*/
2727

2828
#ifdef HAVE_CGNS
29-
#include "../include/fem_cgns_elements.hpp"
30-
#include "../include/geometry_structure_fem_part.hpp"
31-
#include "../include/mpi_structure.hpp"
32-
#include "../include/datatype_structure.hpp"
29+
#include "../../include/fem/fem_cgns_elements.hpp"
30+
#include "../../include/fem/geometry_structure_fem_part.hpp"
31+
#include "../../include/mpi_structure.hpp"
32+
#include "../../include/datatype_structure.hpp"
3333

3434
#include <cmath>
3535
#include <climits>

0 commit comments

Comments
 (0)