Skip to content

Commit 1b2b471

Browse files
bigfootedbigfooted
committed
remove some more extensions
1 parent 9fb569a commit 1b2b471

File tree

200 files changed

+441
-406
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+441
-406
lines changed

‎Common/src/CConfig.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8537,7 +8537,7 @@ string CConfig::GetObjFunc_Extension(string val_filename) const {
85378537
Filename.append(AdjExt);
85388538

85398539
/*--- Lastly, add the .dat extension ---*/
8540-
Filename.append(".dat");
8540+
//Filename.append(".dat");
85418541

85428542
}
85438543

‎SU2_CFD/src/solvers/CSolver.cpp‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3598,18 +3598,23 @@ void CSolver::LoadInletProfile(CGeometry **geometry,
35983598

35993599
/*--- strip the .dat (or other) extension from the inlet_profile.dat filename. ---*/
36003600

3601-
//unsigned short lastindex = profile_filename.find_last_of('.');
3602-
//profile_filename = profile_filename.substr(0, lastindex);
3601+
unsigned short lastindex = profile_filename.find_last_of('.');
3602+
string ext = "";
3603+
3604+
if (lastindex != string::npos)
3605+
ext = profile_filename.substr(lastindex);
3606+
profile_filename = profile_filename.substr(0, lastindex);
3607+
36033608

36043609
/*--- Multizone problems require the number of the zone to be appended. ---*/
36053610

36063611
if (nZone > 1)
3607-
profile_filename = config->GetMultizone_FileName(profile_filename, iZone, "");
3612+
profile_filename = config->GetMultizone_FileName(profile_filename, iZone, ext);
36083613

36093614
/*--- Modify file name for an unsteady restart ---*/
36103615

36113616
if (time_stepping)
3612-
profile_filename = config->GetUnsteady_FileName(profile_filename, val_iter, "");
3617+
profile_filename = config->GetUnsteady_FileName(profile_filename, val_iter, ext);
36133618

36143619

36153620
// create vector of column names

‎SU2_PY/SU2/io/state.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ def find_files(self, config):
259259
files = self.FILES
260260

261261
mesh_name = config.MESH_FILENAME
262+
print("state:: find_files: binary restart = ",config.READ_BINARY_RESTART)
262263
if config.get("READ_BINARY_RESTART", "YES") == "NO":
263264
if not "RESTART_ASCII" in config.get("OUTPUT_FILES", ["RESTART"]):
264265
print(
@@ -269,12 +270,18 @@ def find_files(self, config):
269270
direct_name = config.SOLUTION_FILENAME
270271
adjoint_name = config.SOLUTION_ADJ_FILENAME
271272

273+
print("direct name=",direct_name)
274+
272275
if "RESTART_ASCII" in config.get("OUTPUT_FILES", ["RESTART"]):
273-
direct_name = direct_name.split(".")[0] + ".csv"
274-
adjoint_name = adjoint_name.split(".")[0] + ".csv"
276+
#direct_name = direct_name.split(".")[0] + ".csv"
277+
#adjoint_name = adjoint_name.split(".")[0] + ".csv"
278+
direct_name = direct_name + ".csv"
279+
adjoint_name = adjoint_name + ".csv"
275280
else:
276-
direct_name = direct_name.split(".")[0] + ".dat"
277-
adjoint_name = adjoint_name.split(".")[0] + ".dat"
281+
#direct_name = direct_name.split(".")[0] + ".dat"
282+
#adjoint_name = adjoint_name.split(".")[0] + ".dat"
283+
direct_name = direct_name + ".dat"
284+
adjoint_name = adjoint_name + ".dat"
278285

279286
targetea_name = "TargetEA.dat"
280287
targetcp_name = "TargetCp.dat"

‎SU2_PY/SU2/io/tools.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,8 +1178,11 @@ def restart2solution(config, state={}):
11781178
if config.MATH_PROBLEM == "DIRECT":
11791179
restart = config.RESTART_FILENAME
11801180
solution = config.SOLUTION_FILENAME
1181-
restart = restart.split(".")[0]
1182-
solution = solution.split(".")[0]
1181+
#restart = restart.split(".")[0]
1182+
#solution = solution.split(".")[0]
1183+
1184+
restart = restart
1185+
solution = solution
11831186

11841187
if "RESTART_ASCII" in config.get("OUTPUT_FILES", ["RESTART_BINARY"]):
11851188
restart += ".csv"
@@ -1195,10 +1198,13 @@ def restart2solution(config, state={}):
11951198
restarts = expand_time(restarts, config)
11961199
solutions = expand_time(solutions, config)
11971200

1201+
1202+
print("copy restart to solution:",restarts," ", solutions)
11981203
# move
11991204
for res, sol in zip(restarts, solutions):
12001205
if os.path.exists(res):
1201-
shutil.move(res, sol)
1206+
#shutil.move(res, sol)
1207+
shutil.copy(res, sol)
12021208
# update state
12031209
if state:
12041210
state.FILES.DIRECT = solution

‎SU2_PY/compute_polar.py‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -482,10 +482,16 @@ def main():
482482
# if caseName exists copy the restart file from it for run continuation
483483
# Continue from previous sweep point if this is not he first
484484
if os.path.isdir(caseName):
485-
command = "cp " + caseName + "/" + config.SOLUTION_FILENAME + " ."
485+
486+
print("config option READ_BINARY_RESTART=",config.READ_BINARY_RESTART)
487+
if config.READ_BINARY_RESTART == "YES":
488+
file_ext=".dat"
489+
else:
490+
file_ext=".csv"
491+
command = "cp " + caseName + "/" + config.SOLUTION_FILENAME + file_ext + " ."
486492
if options.verbose:
487493
print(command)
488-
shutil.copy2(caseName + "/" + config.SOLUTION_FILENAME, os.getcwd())
494+
shutil.copy2(caseName + "/" + config.SOLUTION_FILENAME + file_ext, os.getcwd())
489495
konfig.RESTART_SOL = "YES"
490496
else:
491497
konfig.RESTART_SOL = "NO"
@@ -557,7 +563,12 @@ def main():
557563
# save data
558564
SU2.io.save_data("results.pkl", results)
559565
shutil.copy2("results.pkl", "DIRECT")
560-
shutil.copy2(config.SOLUTION_FILENAME, "DIRECT")
566+
567+
if config.READ_BINARY_RESTART == "YES":
568+
file_ext=".dat"
569+
else:
570+
file_ext=".csv"
571+
shutil.copy2(config.SOLUTION_FILENAME+file_ext, "DIRECT")
561572

562573
if os.path.isdir(caseName):
563574
command = (
@@ -569,6 +580,7 @@ def main():
569580
if options.verbose:
570581
print(command)
571582
os.system(command)
583+
print("remove ",caseName)
572584
shutil.rmtree(caseName)
573585

574586
command = "cp -p -R DIRECT " + caseName
@@ -580,8 +592,12 @@ def main():
580592
f.close()
581593
if os.path.isdir("DIRECT"):
582594
shutil.rmtree("DIRECT")
583-
if os.path.isfile(config.SOLUTION_FILENAME):
584-
os.remove(config.SOLUTION_FILENAME)
595+
if config.READ_BINARY_RESTART == "YES":
596+
file_ext=".dat"
597+
else:
598+
file_ext=".csv"
599+
if os.path.isfile(config.SOLUTION_FILENAME+file_ext):
600+
os.remove(config.SOLUTION_FILENAME+file_ext)
585601
if os.path.isfile("results.pkl"):
586602
os.remove("results.pkl")
587603
print("Post sweep cleanup completed")

‎TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ MESH_FILENAME= mesh_NACA0012_inv.su2
114114
MESH_FORMAT= SU2
115115
MESH_OUT_FILENAME= mesh_out.su2
116116
SOLUTION_FILENAME= solution_flow
117-
SOLUTION_ADJ_FILENAME= solution_adj.dat
117+
SOLUTION_ADJ_FILENAME= solution_adj
118118
TABULAR_FORMAT= TECPLOT
119119
CONV_FILENAME= history
120120
RESTART_FILENAME= restart_flow
121-
RESTART_ADJ_FILENAME= restart_adj.dat
121+
RESTART_ADJ_FILENAME= restart_adj
122122
VOLUME_FILENAME= flow
123123
VOLUME_ADJ_FILENAME= adjoint
124124
GRAD_OBJFUNC_FILENAME= of_grad.dat

‎TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ MESH_FILENAME= mesh_NACA0012_inv.su2
114114
MESH_FORMAT= SU2
115115
MESH_OUT_FILENAME= mesh_out.su2
116116
SOLUTION_FILENAME= solution_flow
117-
SOLUTION_ADJ_FILENAME= solution_adj.dat
117+
SOLUTION_ADJ_FILENAME= solution_adj
118118
TABULAR_FORMAT= TECPLOT
119119
CONV_FILENAME= history
120120
RESTART_FILENAME= restart_flow
121-
RESTART_ADJ_FILENAME= restart_adj.dat
121+
RESTART_ADJ_FILENAME= restart_adj
122122
VOLUME_FILENAME= flow
123123
VOLUME_ADJ_FILENAME= adjoint
124124
GRAD_OBJFUNC_FILENAME= of_grad.dat

‎TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ MESH_FILENAME= mesh_NACA0012_inv.su2
8888
MESH_FORMAT= SU2
8989
MESH_OUT_FILENAME= mesh_out.su2
9090
SOLUTION_FILENAME= solution_flow
91-
SOLUTION_ADJ_FILENAME= solution_adj.dat
91+
SOLUTION_ADJ_FILENAME= solution_adj
9292
TABULAR_FORMAT= TECPLOT
9393
CONV_FILENAME= history
9494
RESTART_FILENAME= restart_flow
95-
RESTART_ADJ_FILENAME= restart_adj.dat
95+
RESTART_ADJ_FILENAME= restart_adj
9696
VOLUME_FILENAME= flow
9797
VOLUME_ADJ_FILENAME= adjoint
9898
GRAD_OBJFUNC_FILENAME= of_grad.dat

‎TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ CONV_CAUCHY_EPS= 1E-10
101101
MESH_FILENAME= mesh_ONERAM6_inv_ffd.su2
102102
MESH_OUT_FILENAME= mesh_out.su2
103103
SOLUTION_FILENAME= solution_flow
104-
SOLUTION_ADJ_FILENAME= solution_adj.dat
104+
SOLUTION_ADJ_FILENAME= solution_adj
105105
MESH_FORMAT= SU2
106106
TABULAR_FORMAT= CSV
107107
CONV_FILENAME= history
108108
RESTART_FILENAME= restart_flow
109-
RESTART_ADJ_FILENAME= restart_adj.dat
109+
RESTART_ADJ_FILENAME= restart_adj
110110
VOLUME_FILENAME= flow
111111
VOLUME_ADJ_FILENAME= adjoint
112112
GRAD_OBJFUNC_FILENAME= of_grad.dat

‎TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ MESH_FILENAME= mesh_wedge_inv_FFD.su2
9696
MESH_FORMAT= SU2
9797
MESH_OUT_FILENAME= mesh_out.su2
9898
SOLUTION_FILENAME= solution_flow
99-
SOLUTION_ADJ_FILENAME= solution_adj.dat
99+
SOLUTION_ADJ_FILENAME= solution_adj
100100
TABULAR_FORMAT= TECPLOT
101101
CONV_FILENAME= history
102102
RESTART_FILENAME= restart_flow
103-
RESTART_ADJ_FILENAME= restart_adj.dat
103+
RESTART_ADJ_FILENAME= restart_adj
104104
VOLUME_FILENAME= flow
105105
VOLUME_ADJ_FILENAME= adjoint
106106
GRAD_OBJFUNC_FILENAME= of_grad.dat

0 commit comments

Comments
 (0)