Compare commits

..

2 Commits

Author SHA1 Message Date
Alex38Lyon 942c795418 Merge branch 'main' of https://github.com/Alex38Lyon/Synthese-PSM_LARRA 2025-11-21 16:22:46 +01:00
Alex38Lyon cc0a7dcb37 L5 update 2025-11-21 16:22:41 +01:00
5 changed files with 43 additions and 35 deletions
+1 -1
Submodule Data updated: a3b37a6130...462109f790
Binary file not shown.
+19 -11
View File
@@ -67280,9 +67280,14 @@ insert into SCRAPS values (44769, 44763, 'SP-Explo_14_2025_08_13_01', 1, 31.2555
insert into SURVEY values (44796, 44794, 'Explo_15_2025_08_13', 'Explo_15_2025_08_13.Explo_15_2025_08_13.L5.Synthese-PSM_LARRA', 'Galerie on ne manque pas d''air (suite)');
insert into CENTRELINE values (44797, 44796, NULL, NULL, NULL, 0.00, 0.00, 0.00);
insert into CENTRELINE values (44798, 44796, NULL, '2025-01-01', '2010-01-01', 52.71, 0.00, 0.00);
insert into PERSON values (148, 'Malo', 'Courtier');
insert into TOPO values (148, 44798);
insert into TOPO values (119, 44798);
insert into PERSON values (148, 'Clan', 'Des Tritons');
insert into EXPLO values (148, 44798);
insert into PERSON values (149, 'Benoit', 'Poss');
insert into TOPO values (149, 44798);
insert into EXPLO values (46, 44798);
insert into PERSON values (150, 'Clan', 'Des Tritons');
insert into EXPLO values (150, 44798);
insert into EXPLO values (49, 44798);
insert into EXPLO values (143, 44798);
insert into SHOT values (50412, 51743, 51744, 44798, 9.930, 131.46, -1.40, 9.935, 131.49, -1.38, 0.007, 171.98, 20.77);
@@ -67309,7 +67314,10 @@ insert into SCRAPS values (44800, 44794, 'SP-Explo_15_2025_08_13_01', 1, 37.7369
insert into SURVEY values (44852, 44850, 'Explo_16_2025_08_15', 'Explo_16_2025_08_15.Explo_16_2025_08_15.L5.Synthese-PSM_LARRA', 'Galerie on ne manque pas d''air');
insert into CENTRELINE values (44853, 44852, NULL, NULL, NULL, 0.00, 0.00, 0.00);
insert into CENTRELINE values (44854, 44852, NULL, '2025-01-01', '1974-01-01', 148.16, 0.00, 0.00);
insert into TOPO values (148, 44854);
insert into TOPO values (119, 44854);
insert into TOPO values (149, 44854);
insert into EXPLO values (46, 44854);
insert into EXPLO values (49, 44854);
insert into EXPLO values (143, 44854);
insert into EXPLO values (147, 44854);
@@ -67964,8 +67972,8 @@ insert into SURVEY values (45104, 59, 'M414', 'M414.Synthese-PSM_LARRA', 'M414')
insert into CENTRELINE values (45109, 45108, NULL, NULL, NULL, 0.00, 0.00, 0.00);
insert into CENTRELINE values (45110, 45108, NULL, '1984-01-01', '1984-01-01', 187.45, 0.00, 0.00);
insert into TOPO values (75, 45110);
insert into PERSON values (149, 'G.S.', 'Haut Pyreneen');
insert into EXPLO values (149, 45110);
insert into PERSON values (151, 'G.S.', 'Haut Pyreneen');
insert into EXPLO values (151, 45110);
insert into EXPLO values (74, 45110);
insert into SHOT values (50947, 52296, 52297, 45110, 0.000, 354.19, 0.00, 0.000, 90.00, 0.00, 0.000, 90.00, 0.00);
insert into SHOT values (50948, 52297, 52298, 45110, 20.700, 102.19, -73.50, 20.703, 102.17, -73.49, 0.004, 71.60, -34.31);
@@ -68001,7 +68009,7 @@ insert into SCRAPS values (45112, 45106, 'SP-Explo_01_1984_07_01_01', 1, 0.49325
insert into CENTRELINE values (45163, 45162, NULL, NULL, NULL, 0.00, 0.00, 0.00);
insert into CENTRELINE values (45164, 45162, NULL, '1984-01-01', '1984-01-01', 167.46, 0.00, 0.00);
insert into TOPO values (75, 45164);
insert into EXPLO values (149, 45164);
insert into EXPLO values (151, 45164);
insert into EXPLO values (74, 45164);
insert into SHOT values (50969, 52319, 52320, 45164, 0.000, 354.19, 0.00, 0.000, 90.00, 0.00, 0.000, 90.00, 0.00);
insert into SHOT values (50970, 52320, 52321, 45164, 5.920, 280.39, -90.00, 5.920, 90.00, -90.00, 0.000, 280.39, -74.16);
@@ -68040,7 +68048,7 @@ insert into SCRAPS values (45166, 45160, 'SP-Explo_02_1984_08_06_01', 1, 41.2946
insert into CENTRELINE values (45228, 45227, NULL, NULL, NULL, 0.00, 0.00, 0.00);
insert into CENTRELINE values (45229, 45227, NULL, '1984-01-01', '1984-01-01', 274.21, 0.00, 0.00);
insert into TOPO values (75, 45229);
insert into EXPLO values (149, 45229);
insert into EXPLO values (151, 45229);
insert into EXPLO values (74, 45229);
insert into SHOT values (50994, 52345, 52346, 45229, 4.280, 146.29, 36.00, 4.280, 146.17, 35.90, 0.010, 87.96, -35.02);
insert into SHOT values (50995, 52346, 52347, 45229, 6.300, 291.19, -16.50, 6.303, 291.13, -16.40, 0.013, 247.80, 47.99);
@@ -68082,7 +68090,7 @@ insert into SCRAPS values (45231, 45225, 'SP-Explo_03_1984_08_10_01', 1, 39.2945
insert into CENTRELINE values (45301, 45300, NULL, NULL, NULL, 0.00, 0.00, 0.00);
insert into CENTRELINE values (45302, 45300, NULL, '1987-01-01', '1987-01-01', 178.33, 0.00, 40.10);
insert into TOPO values (75, 45302);
insert into EXPLO values (149, 45302);
insert into EXPLO values (151, 45302);
insert into EXPLO values (74, 45302);
insert into SHOT values (51022, 52374, 52375, 45302, 0.000, 354.58, 0.00, 0.022, 0.00, -26.57, 0.022, 0.00, -26.57);
insert into SHOT_FLAG values(51022, 'dpl');
@@ -78438,8 +78446,8 @@ insert into SURVEY values (49361, 59, 'Z510', 'Z510.Synthese-PSM_LARRA', 'Z510')
insert into SURVEY values (49365, 49363, 'Z510_Entree', 'Z510_Entree.Z510_Entree.Z510.Synthese-PSM_LARRA', 'Gouffre Z510');
insert into CENTRELINE values (49366, 49365, NULL, NULL, NULL, 0.00, 0.00, 0.00);
insert into CENTRELINE values (49367, 49365, NULL, '2020-09-06', '2020-01-01', 196.83, 0.00, 0.00);
insert into PERSON values (150, 'Bastien', 'Courtier');
insert into TOPO values (150, 49367);
insert into PERSON values (152, 'Bastien', 'Courtier');
insert into TOPO values (152, 49367);
insert into TOPO values (44, 49367);
insert into EXPLO values (46, 49367);
insert into EXPLO values (49, 49367);
@@ -78645,8 +78653,8 @@ insert into SHOT values (60634, 61818, 61946, 49369, 2.470, 251.11, 2.70, 2.466,
insert into SHOT values (60635, 61818, 61947, 49369, 0.160, 96.31, 87.30, 0.160, 90.00, 86.42, 0.003, 71.72, 3.85);
insert into SHOT values (60636, 61818, 61948, 49369, 1.060, 218.61, -78.10, 1.053, 219.47, -77.93, 0.008, 282.46, 62.94);
insert into CENTRELINE values (49370, 49365, NULL, '2022-08-12', '2022-01-01', 98.86, 0.00, 0.00);
insert into PERSON values (151, 'Anouk', 'Darne');
insert into TOPO values (151, 49370);
insert into PERSON values (153, 'Anouk', 'Darne');
insert into TOPO values (153, 49370);
insert into TOPO values (44, 49370);
insert into EXPLO values (46, 49370);
insert into EXPLO values (49, 49370);
+1 -1
View File
@@ -98,7 +98,7 @@ layout my_layout
# Une ligne pour specifier que la grille est 1000x1000x1000 m
# (Trois dimensions, oui, ça sert pour la coupe aussi)
grid-size 500 500 500 m
grid-size 100 100 100 m
# la topo est transparente (on peut voir les galeries en dessous)
# C'est on par défaut, donc, pas vraiment besoin de specifier
+22 -22
View File
@@ -94,22 +94,22 @@ processing survey data ...
####################### cavern log file ########################
1> Survex 1.4.17
2> Copyright ¸ 1990-2025 Olly Betts
3> C:\Users\alexa\AppData\Local\Temp\th7104\data.svx:1191:6: warning: Station already fixed at the same coordinates
3> C:\Users\alexa\AppData\Local\Temp\th1440\data.svx:1191:6: warning: Station already fixed at the same coordinates
4> *fix 1122 680916.000000 4757614.000000 1719.000000
5> ^~~~
6> C:\Users\alexa\AppData\Local\Temp\th7104\data.svx:1190: info: Previously fixed or equated here
7> C:\Users\alexa\AppData\Local\Temp\th7104\data.svx:9996:6: warning: Station already fixed at the same coordinates
6> C:\Users\alexa\AppData\Local\Temp\th1440\data.svx:1190: info: Previously fixed or equated here
7> C:\Users\alexa\AppData\Local\Temp\th1440\data.svx:9996:6: warning: Station already fixed at the same coordinates
8> *fix 9182 684221.000000 4757518.000000 2095.800000
9> ^~~~
10> C:\Users\alexa\AppData\Local\Temp\th7104\data.svx:9995: info: Previously fixed or equated here
11> C:\Users\alexa\AppData\Local\Temp\th7104\data.svx:11952:6: warning: Station already fixed at the same coordinates
10> C:\Users\alexa\AppData\Local\Temp\th1440\data.svx:9995: info: Previously fixed or equated here
11> C:\Users\alexa\AppData\Local\Temp\th1440\data.svx:11952:6: warning: Station already fixed at the same coordinates
12> *fix 11156 684221.000000 4757518.000000 2095.800000
13> ^~~~~
14> C:\Users\alexa\AppData\Local\Temp\th7104\data.svx:11951: info: Previously fixed or equated here
15> C:\Users\alexa\AppData\Local\Temp\th7104\data.svx:17381:6: warning: Station already fixed at the same coordinates
14> C:\Users\alexa\AppData\Local\Temp\th1440\data.svx:11951: info: Previously fixed or equated here
15> C:\Users\alexa\AppData\Local\Temp\th1440\data.svx:17381:6: warning: Station already fixed at the same coordinates
16> *fix 16378 683605.000000 4757525.000000 2045.000000
17> ^~~~~
18> C:\Users\alexa\AppData\Local\Temp\th7104\data.svx:17380: info: Previously fixed or equated here
18> C:\Users\alexa\AppData\Local\Temp\th1440\data.svx:17380: info: Previously fixed or equated here
19>
20> Survey contains 62725 survey stations, joined by 62980 legs.
21> There are 427 loops.
@@ -124,25 +124,25 @@ processing survey data ...
30> There were 4 warning(s).
31>
######################### transcription ########################
3> 7104 : C214_d_56@Explo_01_2013_10_09.Explo_01_2013_10_09.C214-Niebla.Synthese-PSM_LARRA
3> 1440 : KH5D@Explo_03_2005_08_11.Explo_03_2005_08_11.AN103.Synthese-PSM_LARRA
3> input:1191 -- Data/AN026/Data/Explo_01_2006_11_04/Data/Explo_01_2006_11_04.th [17]
4> 1122 : AN26@Explo_01_2006_11_04.Explo_01_2006_11_04.AN026.Synthese-PSM_LARRA
6> 7104 : C214_d_56@Explo_01_2013_10_09.Explo_01_2013_10_09.C214-Niebla.Synthese-PSM_LARRA
6> 1440 : KH5D@Explo_03_2005_08_11.Explo_03_2005_08_11.AN103.Synthese-PSM_LARRA
6> input:1190 -- Data/AN026/Data/Explo_01_2006_11_04/Data/Explo_01_2006_11_04.th [15]
7> 7104 : C214_d_56@Explo_01_2013_10_09.Explo_01_2013_10_09.C214-Niebla.Synthese-PSM_LARRA
7> 1440 : KH5D@Explo_03_2005_08_11.Explo_03_2005_08_11.AN103.Synthese-PSM_LARRA
7> input:9996 -- Data/Complexe_Anialarra/Data/Explo_56_2003_08_02/Data/Explo_56_2003_08_02.th [17]
8> 9182 : AN548@Explo_56_2003_08_02.Explo_56_2003_08_02.Complexe_Anialarra.Synthese-PSM_LARRA
10> 7104 : C214_d_56@Explo_01_2013_10_09.Explo_01_2013_10_09.C214-Niebla.Synthese-PSM_LARRA
10> 1440 : KH5D@Explo_03_2005_08_11.Explo_03_2005_08_11.AN103.Synthese-PSM_LARRA
10> input:9995 -- Data/Complexe_Anialarra/Data/Explo_56_2003_08_02/Data/Explo_56_2003_08_02.th [15]
11> 7104 : C214_d_56@Explo_01_2013_10_09.Explo_01_2013_10_09.C214-Niebla.Synthese-PSM_LARRA
11> 1440 : KH5D@Explo_03_2005_08_11.Explo_03_2005_08_11.AN103.Synthese-PSM_LARRA
11> input:11952 -- Data/Complexe_Anialarra/Data/Explo_132_2009_07_09/Data/Explo_132_2009_07_09.th [17]
12> 11156 : AN548@Explo_132_2009_07_09.Explo_132_2009_07_09.Complexe_Anialarra.Synthese-PSM_LARRA
14> 7104 : C214_d_56@Explo_01_2013_10_09.Explo_01_2013_10_09.C214-Niebla.Synthese-PSM_LARRA
14> 1440 : KH5D@Explo_03_2005_08_11.Explo_03_2005_08_11.AN103.Synthese-PSM_LARRA
14> input:11951 -- Data/Complexe_Anialarra/Data/Explo_132_2009_07_09/Data/Explo_132_2009_07_09.th [15]
15> 7104 : C214_d_56@Explo_01_2013_10_09.Explo_01_2013_10_09.C214-Niebla.Synthese-PSM_LARRA
15> 1440 : KH5D@Explo_03_2005_08_11.Explo_03_2005_08_11.AN103.Synthese-PSM_LARRA
15> input:17381 -- Data/Complexe_Anialarra/Data/Explo_401_2023_09_17/Data/Explo_401_2023_09_17.th [17]
16> 16378 : AN3@Explo_401_2023_09_17.Explo_401_2023_09_17.Complexe_Anialarra.Synthese-PSM_LARRA
18> 7104 : C214_d_56@Explo_01_2013_10_09.Explo_01_2013_10_09.C214-Niebla.Synthese-PSM_LARRA
18> 1440 : KH5D@Explo_03_2005_08_11.Explo_03_2005_08_11.AN103.Synthese-PSM_LARRA
18> input:17380 -- Data/Complexe_Anialarra/Data/Explo_401_2023_09_17/Data/Explo_401_2023_09_17.th [15]
20> 62725 : 27@Z510_Fond.Z510_Fond.Z510.Synthese-PSM_LARRA
21> 427 : AN8_d_631@Explo_03_1992_08_01.Explo_03_1992_08_01.AN008.Synthese-PSM_LARRA
@@ -669,7 +669,7 @@ S 1.5e+03 SP-Explo_02_2009_08_01_01@Explo_02_2009_08_01.C104.Complexe_PSM_GdP.S
writing Outputs/Synthese-PSM_LARRA-Plan.pdf ...
processing projection none ... done
####################### metapost log file ########################
This is MetaPost, version 2.01 (TeX Live 2021/W32TeX) (kpathsea version 6.3.3) 17 NOV 2025 18:00
This is MetaPost, version 2.01 (TeX Live 2021/W32TeX) (kpathsea version 6.3.3) 21 NOV 2025 16:05
**data.mp
(c:/Program Files/Therion/texmf/mpost/mpost.mp
(c:/Program Files/Therion/texmf/mpost/plain.mp
@@ -963,7 +963,7 @@ Here is how much of MetaPost's memory you used:
converting scraps ... done
making map ... done
######################## pdftex log file #########################
This is pdfTeX, Version 3.141592653-2.6-1.40.22 (TeX Live 2021/W32TeX) (preloaded format=pdfetex 2023.12.2) 17 NOV 2025 18:01
This is pdfTeX, Version 3.141592653-2.6-1.40.22 (TeX Live 2021/W32TeX) (preloaded format=pdfetex 2023.12.2) 21 NOV 2025 16:06
entering extended mode
**data.tex
(./data.tex (./th_enc.tex) (./th_texts.tex) (./th_resources.tex
@@ -979,7 +979,7 @@ go-ARSIP-Synthese-Topographique_XL.png>) (./th_pages.tex)
Here is how much of TeX's memory you used:
2797 strings out of 95671
34728 string characters out of 1192323
1187294 words of memory out of 2598337
1722899 words of memory out of 2944942
4190 multiletter control sequences out of 15000+50000
21229 words of font info for 66 fonts, out of 1000000 for 2000
844 hyphenation exceptions out of 5000
@@ -988,7 +988,7 @@ Here is how much of TeX's memory you used:
xmf/fonts/type1/cmss10.pfb><c:/Program Files/Therion/texmf/fonts/type1/cmssi10.
pfb><c:/Program Files/Therion/texmf/fonts/type1/csss10.pfb><c:/Program Files/Th
erion/texmf/fonts/type1/csssi10.pfb>
Output written on data.pdf (1 page, 52146842 bytes).
Output written on data.pdf (1 page, 52214180 bytes).
PDF statistics:
5578 PDF objects out of 6186 (max. 8388607)
2777 compressed objects within 28 object streams
@@ -1072,7 +1072,7 @@ processing projection extended ... done
average distortion: 16.07%
done
####################### metapost log file ########################
This is MetaPost, version 2.01 (TeX Live 2021/W32TeX) (kpathsea version 6.3.3) 17 NOV 2025 18:08
This is MetaPost, version 2.01 (TeX Live 2021/W32TeX) (kpathsea version 6.3.3) 21 NOV 2025 16:14
**data.mp
(c:/Program Files/Therion/texmf/mpost/mpost.mp
(c:/Program Files/Therion/texmf/mpost/plain.mp
@@ -1101,7 +1101,7 @@ writing Outputs/Synthese-PSM_LARRA-model.kml ... done
writing Outputs/Synthese-PSM_LARRA-3D.kml ... done
writing Outputs/Synthese-PSM_LARRA-Cave-list.html ... done
writing Outputs/Synthese-PSM_LARRA-Surveys.html ... done
compilation time: 519 sec
compilation time: 574 sec
######################### loop errors ##########################