diff --git a/surfaceRoughness_oh2004/SoilMoistureMain.py b/surfaceRoughness_oh2004/SoilMoistureMain.py index 9b285920..3c86ff19 100644 --- a/surfaceRoughness_oh2004/SoilMoistureMain.py +++ b/surfaceRoughness_oh2004/SoilMoistureMain.py @@ -313,6 +313,12 @@ class MoistureMain: out_path1 = os.path.join(tem_folder, "trans_geo_projcs.tif") out_path2 = os.path.join(tem_folder, "trans_projcs_geo.tif") par_dict = CreateDict(image_path, self.processinfo, out_path1, out_path2).calu_nature(start) + + # TODO:从原始文件的xml中获取得到方位角信息 SurfaceRoughness\Temporary\preprocessing\影像名\ 文件夹下 -ortho.meta.xml + Azimuth=self.__processing_paras['META'] + par_dict.update({"imageinfo_SatelliteAzimuth": "None"}) + + model_xml_path = os.path.join(tem_folder, "creat_standard.meta.xml") # 输出xml路径 id_min = 0 diff --git a/surfaceRoughness_oh2004/SurfaceRoughness.xml b/surfaceRoughness_oh2004/SurfaceRoughness.xml index 972a655c..4acde4fa 100644 --- a/surfaceRoughness_oh2004/SurfaceRoughness.xml +++ b/surfaceRoughness_oh2004/SurfaceRoughness.xml @@ -1,7 +1,7 @@ CSAR_202107275419_0001-0 - D:\micro\WorkSpace\ + K:\mircoData\OutTest\ File ElementAlg @@ -38,7 +38,7 @@ File tar.gz Man - E:\MicroWorkspace\Micro\neimenggu\GF3_MDJ_QPSI_031847_E116.4_N43.9_20220828_L1A_AHV_L10006708819-ortho.tar.gz + K:\mircoData\surfaceRoughnessData\GF3_MDJ_QPSI_031847_E116.4_N43.9_20220828_L1A_AHV_L10006708819-ortho.tar.gz True False File @@ -68,7 +68,7 @@ File tif Man - E:\MicroWorkspace\Micro\neimenggu\N50_40_2020LC030_geo.tif + K:\mircoData\surfaceRoughnessData\N50_40_2020LC030_geo.tif True False File @@ -98,7 +98,7 @@ File tif Man - E:\MicroWorkspace\Micro\neimenggu\L9NDVI.tif + K:\mircoData\surfaceRoughnessData\L9NDVI.tif True False File @@ -130,7 +130,7 @@ File tar.gz Man - D:\micro\WorkSpace\SurfaceRoughness\Output\SurfaceRoughnessProduct.tar.gz + K:\mircoData\OutTest\SurfaceRoughness\Output\SurfaceRoughnessProduct.tar.gz diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/ImageMatch.obj b/surfaceRoughness_oh2004/baseTool/x64/Release/ImageMatch.obj index b4cf694c..79497963 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/ImageMatch.obj and b/surfaceRoughness_oh2004/baseTool/x64/Release/ImageMatch.obj differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/LIBPQ.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/LIBPQ.dll index 80a02073..5485eab4 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/LIBPQ.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/LIBPQ.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/OctreeNode.obj b/surfaceRoughness_oh2004/baseTool/x64/Release/OctreeNode.obj index 62ecb465..199fc671 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/OctreeNode.obj and b/surfaceRoughness_oh2004/baseTool/x64/Release/OctreeNode.obj differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/RPC_Correct.obj b/surfaceRoughness_oh2004/baseTool/x64/Release/RPC_Correct.obj index 86aec2c5..84906f63 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/RPC_Correct.obj and b/surfaceRoughness_oh2004/baseTool/x64/Release/RPC_Correct.obj differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.exe b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.exe index 30afb16d..62066607 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.exe and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.exe differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.exe.recipe b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.exe.recipe index c8208373..227d1fb2 100644 --- a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.exe.recipe +++ b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.exe.recipe @@ -2,7 +2,7 @@ - D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\SIMOrthoProgram.exe + D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\SIMOrthoProgram.exe diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.obj b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.obj index a4e708b0..9effbc18 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.obj and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.obj differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.pdb b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.pdb index 91ef1764..f5ce824d 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.pdb and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.pdb differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.res b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.res index 694adf43..36f26e23 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.res and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.res differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.command.1.tlog b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.command.1.tlog index 0242f7af..d4f059c4 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.command.1.tlog and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.command.1.tlog differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.read.1.tlog b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.read.1.tlog index 6896398c..c14214f2 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.read.1.tlog and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.read.1.tlog differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.write.1.tlog b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.write.1.tlog index f2118e35..3bce5d54 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.write.1.tlog and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.write.1.tlog differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.lastbuildstate b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.lastbuildstate index 791ec213..199016fd 100644 --- a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.lastbuildstate +++ b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.lastbuildstate @@ -1,2 +1,2 @@ -PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.33.31629:TargetPlatformVersion=10.0.19041.0:VcpkgTriplet=x64-windows: -Release|x64|D:\MicroSAR\C-SAR\SIMOrthoProgram\| +PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:VcpkgTriplet=x64-windows: +Debug|x64|D:\WorkProject\mircoCplus\simorthoprogram\| diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.write.1u.tlog b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.write.1u.tlog index d3af254e..69a2530e 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.write.1u.tlog and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.write.1u.tlog differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.command.1.tlog b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.command.1.tlog index a63e2f38..34d80e92 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.command.1.tlog and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.command.1.tlog differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.read.1.tlog b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.read.1.tlog index d82fa823..8fbc5096 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.read.1.tlog and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.read.1.tlog differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.write.1.tlog b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.write.1.tlog index b3e4f304..3eb8b219 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.write.1.tlog and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/link.write.1.tlog differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.command.1.tlog b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.command.1.tlog index f002885a..7d2deba6 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.command.1.tlog and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.command.1.tlog differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.read.1.tlog b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.read.1.tlog index 36c38faa..5542b530 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.read.1.tlog and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.read.1.tlog differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.write.1.tlog b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.write.1.tlog index f949d32c..09c0bf79 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.write.1.tlog and b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.write.1.tlog differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.vcxproj.FileListAbsolute.txt b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.vcxproj.FileListAbsolute.txt index f57ca3cf..b6001727 100644 --- a/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.vcxproj.FileListAbsolute.txt +++ b/surfaceRoughness_oh2004/baseTool/x64/Release/SIMOrthoProgram.vcxproj.FileListAbsolute.txt @@ -1,44 +1,40 @@ -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\SIMOrthoProgram.vcxproj.CopyComplete -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\SIMOrthoProgram.exe -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\concrt140.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\msvcp140.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\msvcp140_1.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\msvcp140_2.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\msvcp140_atomic_wait.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\msvcp140_codecvt_ids.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\vccorlib140.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\vcruntime140.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\vcruntime140_1.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\vcamp140.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\vcomp140.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\boost_filesystem-vc143-mt-x64-1_79.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\gdal.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\zlib1.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libcrypto-3-x64.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libssl-3-x64.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\liblzma.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\qhull_r.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\jpeg62.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\tiff.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\geotiff.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\proj.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\sqlite3.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libcurl.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libpng16.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\zstd.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\gif.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\netcdf.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\hdf5_hl.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\hdf5.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\webp.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\LIBPQ.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\pcre2-8.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libexpat.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\libxml2.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\iconv-2.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\geos_c.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\geos.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\json-c.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\openjp2.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\spatialite.dll -D:\MicroSAR\C-SAR\SIMOrthoProgram\x64\Release\freexl.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\SIMOrthoProgram.vcxproj.CopyComplete +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\SIMOrthoProgram.exe +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\boost_filesystem-vc142-mt-x64-1_83.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\gdal.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\zlib1.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libcrypto-3-x64.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libssl-3-x64.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\liblzma.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\qhull_r.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\jpeg62.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\tiff.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\geotiff.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\proj.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\sqlite3.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libcurl.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libpng16.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\Lerc.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\zstd.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\gif.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\netcdf.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\hdf5_hl.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\hdf5.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libwebp.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libsharpyuv.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\LIBPQ.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\pcre2-8.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libexpat.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libxml2.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\iconv-2.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\geos_c.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\geos.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\json-c.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\openjp2.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\spatialite.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\freexl-1.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\minizip.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\opencv_core4.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\opencv_imgcodecs4.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\opencv_imgproc4.dll +D:\WorkProject\mircoCplus\simorthoprogram\x64\Debug\libwebpdecoder.dll diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/SateOrbit.obj b/surfaceRoughness_oh2004/baseTool/x64/Release/SateOrbit.obj index cf0512cb..a1cd99c5 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/SateOrbit.obj and b/surfaceRoughness_oh2004/baseTool/x64/Release/SateOrbit.obj differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/baseTool.obj b/surfaceRoughness_oh2004/baseTool/x64/Release/baseTool.obj index 8d5b1ff7..95ead954 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/baseTool.obj and b/surfaceRoughness_oh2004/baseTool/x64/Release/baseTool.obj differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/gdal.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/gdal.dll index 896d0c82..7cce43a0 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/gdal.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/gdal.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/geos.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/geos.dll index 0344b8f1..6c483651 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/geos.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/geos.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/geos_c.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/geos_c.dll index 6196b5aa..9c748861 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/geos_c.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/geos_c.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/geotiff.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/geotiff.dll index 01f252a9..f534bdc5 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/geotiff.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/geotiff.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/gif.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/gif.dll index 00280868..c18e2eaa 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/gif.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/gif.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/hdf5.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/hdf5.dll index 20e1e9d2..62281eff 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/hdf5.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/hdf5.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/hdf5_hl.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/hdf5_hl.dll index fafa1789..373c2801 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/hdf5_hl.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/hdf5_hl.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/iconv-2.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/iconv-2.dll index c8ccdedd..471ffbc7 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/iconv-2.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/iconv-2.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/jpeg62.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/jpeg62.dll index d2fcc1e6..c72ae15e 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/jpeg62.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/jpeg62.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/json-c.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/json-c.dll index dd153628..fe8fedfa 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/json-c.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/json-c.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/libcrypto-3-x64.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/libcrypto-3-x64.dll index d3945bde..c075476c 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/libcrypto-3-x64.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/libcrypto-3-x64.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/libcurl.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/libcurl.dll index 47490d5d..b68e09b4 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/libcurl.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/libcurl.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/libexpat.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/libexpat.dll index 19ab581b..c79fde52 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/libexpat.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/libexpat.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/liblzma.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/liblzma.dll index 27a7a232..8877df5f 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/liblzma.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/liblzma.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/libpng16.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/libpng16.dll index bad61a92..25dc1dd5 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/libpng16.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/libpng16.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/libssl-3-x64.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/libssl-3-x64.dll index 3644b0ed..b32e73d0 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/libssl-3-x64.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/libssl-3-x64.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/libxml2.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/libxml2.dll index 82af5f95..f9131f80 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/libxml2.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/libxml2.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/netcdf.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/netcdf.dll index 9661217b..0a6580ed 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/netcdf.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/netcdf.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/openjp2.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/openjp2.dll index 9e19d0dd..28376a4e 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/openjp2.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/openjp2.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/pcre2-8.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/pcre2-8.dll index f1aab4f4..b3335ed1 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/pcre2-8.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/pcre2-8.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/proj.db b/surfaceRoughness_oh2004/baseTool/x64/Release/proj.db index 32769b3d..020f3a74 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/proj.db and b/surfaceRoughness_oh2004/baseTool/x64/Release/proj.db differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/proj.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/proj.dll index a0b73c0b..4c27e79f 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/proj.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/proj.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/qhull_r.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/qhull_r.dll index 45be5211..6daac879 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/qhull_r.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/qhull_r.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/simptsn.obj b/surfaceRoughness_oh2004/baseTool/x64/Release/simptsn.obj index 40534f72..3e517f7f 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/simptsn.obj and b/surfaceRoughness_oh2004/baseTool/x64/Release/simptsn.obj differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/spatialite.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/spatialite.dll index cfd38bee..16bc9fc2 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/spatialite.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/spatialite.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/sqlite3.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/sqlite3.dll index 3cac4f5b..2904dd0d 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/sqlite3.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/sqlite3.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/test_moudel.obj b/surfaceRoughness_oh2004/baseTool/x64/Release/test_moudel.obj index 567510f4..c5971411 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/test_moudel.obj and b/surfaceRoughness_oh2004/baseTool/x64/Release/test_moudel.obj differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/tiff.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/tiff.dll index 8239d14d..bfba7978 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/tiff.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/tiff.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/zlib1.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/zlib1.dll index f5d72ef5..ad2aafe7 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/zlib1.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/zlib1.dll differ diff --git a/surfaceRoughness_oh2004/baseTool/x64/Release/zstd.dll b/surfaceRoughness_oh2004/baseTool/x64/Release/zstd.dll index 3204bac2..c1347d81 100644 Binary files a/surfaceRoughness_oh2004/baseTool/x64/Release/zstd.dll and b/surfaceRoughness_oh2004/baseTool/x64/Release/zstd.dll differ