diff --git a/doc/users/TP_Hydraulique_Hogneau/step1.pamhyr b/doc/users/TP_Hydraulique_Hogneau/step1.pamhyr index 687fe288533a1d0520500ba6ff1698b69310201e..38912b00003c856878ed7bc61913bb0537eddc49 100644 Binary files a/doc/users/TP_Hydraulique_Hogneau/step1.pamhyr and b/doc/users/TP_Hydraulique_Hogneau/step1.pamhyr differ diff --git a/src/Solver/AdisTS.py b/src/Solver/AdisTS.py index 75f4d7b0454cb923dfb6c365509898df79eb3c65..5f325902fbd9d937177bfec2f24e69c7023cc6a4 100644 --- a/src/Solver/AdisTS.py +++ b/src/Solver/AdisTS.py @@ -128,9 +128,9 @@ class AdisTS(CommandLineSolver): repertory, f"{name}.REP" ), "w+" ) as f: - - f.write(f"NET ../{mage_rep}/{name}.NET\n") - f.write(f"REP ../{mage_rep}/{name}.REP\n") + path = os.path.join("..",mage_rep,name) + f.write(f"NET {path}.NET\n") + f.write(f"REP {path}.REP\n") for file in files: EXT = file.split('.')[1] @@ -140,7 +140,7 @@ class AdisTS(CommandLineSolver): path_mage_net = os.path.join(os.path.abspath( os.path.join(repertory, os.pardir) - ), f"{mage_rep}/net") + ), os.path.join(mage_rep,"net")) path_adists_net = os.path.join(repertory, "net") if os.path.exists(path_mage_net): @@ -729,7 +729,7 @@ class AdisTSwc(AdisTS): data_tmp = {} for file_bin in path_files: - key_pol = file_bin.split("/")[-1][0:-4] + key_pol = os.path.basename(file_bin)[0:-4] data_tmp[key_pol] = {} with open(file_bin, 'rb') as f: # header