From 86b7cad3eaf962f8a5b48fe01f2092c3565e1f87 Mon Sep 17 00:00:00 2001 From: shunli Date: Fri, 7 Apr 2023 10:14:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9python=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RANDI.py | 4 +- cs.py | 4 +- cz.py | 7 +- oanp.py | 4 +- profile.py | 7 +- pyat/AcousticPara.py | 2 +- pyat/DataBase.py | 4 +- pyat/DataBaseWOA.py | 370 +++++++++++++++++++++++++++++++++++++++++++ pyat/ProfileRead.py | 4 +- pyat/ProfileTool.py | 2 +- pyat/RANDIcore.py | 8 +- pyat/WGNPd.py | 2 +- pyat/bellhop.py | 6 +- pyat/config.json | 2 +- pyat/czcore.py | 27 ++-- pyat/krakenc.py | 6 +- pyat/ram.py | 4 +- pyat/ramRW.py | 2 +- pyat/ramRW_new.py | 2 +- pyat/readwrite.py | 2 +- pyat/tlcore.py | 10 +- rl.py | 4 +- tl.py | 5 +- tl_realtime.py | 6 +- wgnp.py | 5 +- 25 files changed, 443 insertions(+), 56 deletions(-) create mode 100755 pyat/DataBaseWOA.py diff --git a/RANDI.py b/RANDI.py index fa44df4..f46d4f7 100644 --- a/RANDI.py +++ b/RANDI.py @@ -3,6 +3,8 @@ import warnings warnings.filterwarnings('ignore') import argparse, json from common import NoIndent, MyEncoder +import os, sys +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))+'/pyat') def _argparse(): parser = argparse.ArgumentParser(description='tl client') @@ -34,7 +36,7 @@ def main(): NThreads = int(paramData["NThreads"]) outParam = paramData["outParam"] - from pyat.RANDIcore import call_RANDI + from RANDIcore import call_RANDI NL = call_RANDI(ETOPO1Path, STPath, outParam["outPath"], freq, receiveDepth, lon, lat, timeType, NThreads) print(round(NL,2)) diff --git a/cs.py b/cs.py index eebf917..337e592 100644 --- a/cs.py +++ b/cs.py @@ -3,6 +3,8 @@ import warnings warnings.filterwarnings('ignore') import argparse, json from common import NoIndent, MyEncoder +import os, sys +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))+'/pyat') def _argparse(): parser = argparse.ArgumentParser(description='cs client') @@ -28,7 +30,7 @@ def main(): c = float(paramData["c"]) outParam = paramData["outParam"] - from pyat.cscore import np, dis_mats, pn_funcs, ag_funcs + from cscore import np, dis_mats, pn_funcs, ag_funcs # 输出： diff --git a/cz.py b/cz.py index a1e3698..db8aa13 100644 --- a/cz.py +++ b/cz.py @@ -3,6 +3,8 @@ import warnings warnings.filterwarnings('ignore') import argparse, json from common import NoIndent, MyEncoder +import os, sys +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))+'/pyat') def _argparse(): parser = argparse.ArgumentParser(description='Average Noise Spectral Level') @@ -41,13 +43,14 @@ def main(): if "outPath" not in outParam: outParam["outPath"] = "" - from pyat.czcore import call_cz + from DataBase import DataBase + from czcore import call_cz import numpy as np # 定义时间段 timeIndex = timeType # 创建类 - database = DataBase(ETOPO1Path, STPath,datasource="") + database = DataBase(ETOPO1Path, STPath,dataSource="") # 设置时间段 database.set_timePeriod(timeIndex) diff --git a/oanp.py b/oanp.py index 4b1e1f4..5c136f2 100644 --- a/oanp.py +++ b/oanp.py @@ -3,6 +3,8 @@ import warnings warnings.filterwarnings('ignore') import argparse, json from common import NoIndent, MyEncoder +import os, sys +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))+'/pyat') def _argparse(): parser = argparse.ArgumentParser(description='Average Noise Spectral Level') @@ -29,7 +31,7 @@ def main(): png = paramData["png"] outParam = paramData["outParam"] - from pyat.OANPd import call_oanp + from OANPd import call_oanp from matplotlib import pyplot as plt import numpy as np diff --git a/profile.py b/profile.py index 8bdc357..7152fee 100755 --- a/profile.py +++ b/profile.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- import warnings warnings.filterwarnings('ignore') - import argparse, json +import os, sys +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))+'/pyat') def _argparse(): parser = argparse.ArgumentParser(description='剖面分析工具, 根据标准化剖面，得到声道, 跃层分析结果') @@ -39,9 +40,9 @@ def main(): if "outPath" not in outParam: outParam["outPath"] = "" - from pyat.DataBase import DataBase + from DataBase import DataBase import matplotlib.pyplot as plt - from pyat.ProfileTool import ProfileTool + import ProfileTool import numpy as np # 定义时间段 timeIndex = timeType diff --git a/pyat/AcousticPara.py b/pyat/AcousticPara.py index 67a3540..f27f31a 100644 --- a/pyat/AcousticPara.py +++ b/pyat/AcousticPara.py @@ -3,7 +3,7 @@ import math from scipy.fftpack import fft from matplotlib import pyplot as plt from scipy.interpolate import interp1d -from pyat.DataBase import DataBase +from DataBase import DataBase class BathyM: def __init__(self, ran=None, depth=None): diff --git a/pyat/DataBase.py b/pyat/DataBase.py index f099021..9ab70ef 100644 --- a/pyat/DataBase.py +++ b/pyat/DataBase.py @@ -1,7 +1,7 @@ import numpy as np from scipy.interpolate import Akima1DInterpolator, interp1d from netCDF4 import Dataset -from pyat.ProfileDataType import Profile +from ProfileDataType import Profile ''' ************************************************************ @@ -33,7 +33,7 @@ class DataBase(): """ 获取数据库中的剖面信息 """ - def __init__(self,ETOPO1path,STpath,dataSource): + def __init__(self,ETOPO1path,STpath,dataSource=None): # 打开ETOPO1数据 fileETOPO1 = ETOPO1path+'/ETOPO1_Bed_g_gmt4.nc' dataETOPO1 = Dataset(fileETOPO1) diff --git a/pyat/DataBaseWOA.py b/pyat/DataBaseWOA.py new file mode 100755 index 0000000..6d36a9f --- /dev/null +++ b/pyat/DataBaseWOA.py @@ -0,0 +1,370 @@ +import numpy as np +from scipy.interpolate import Akima1DInterpolator +from scipy.optimize import curve_fit +from netCDF4 import Dataset +from ProfileDataType import Profile + +''' +************************************************************ +该模块用于从数据库中, 获取剖面信息 +************************************************************ +''' + +# 时间段标识 +timeDict = { + # 全年平均 + 'Annual': '00', + # 1-12月 + 'January': '01', + 'February': '02', + 'March': '03', + 'April': '04', + 'May': '05', + 'June': '06', + 'July': '07', + 'August': '08', + 'September': '09', + 'October': '10', + 'November': '11', + 'December': '12', + # 北半球四季 + 'Winter': '13', + 'Spring': '14', + 'Summer': '15', + 'Autumn': '16' +} + + +# def MunkFormula(z, v1, epsilon, z1): +# eta = 2*(z-z1)/z1 +# return v1*(1+epsilon*(np.exp(-eta)+eta-1)) + +def soundSpeed(tem, sal, dep): + ''' + 声速计算公式 + ''' + # C = 1449.2 + 4.6*T - 0.055*T^2 + 0.00029*T^3 + (1.34 - 0.01*T)(S-35) + 0.017*D + # 式中：T为海⽔测点的温度，单位为℃；S为海⽔测点的盐度，单位为‰；D为海⽔测点的深度，单位为m。 + vel = 1449.2 + 4.6*tem - 0.055*tem*tem + 0.00029 * \ + tem*tem*tem + (1.34 - 0.01*tem) * \ + (sal-35.0) + 0.017*dep + return vel + + +class DataBase(): + """ + 获取数据库中的剖面信息 + """ + + def __init__(self,ETOPO1Path,STpath): + print(ETOPO1Path) + # 打开ETOPO1数据 + fileETOPO1 = ETOPO1Path + '/ETOPO1_Bed_g_gmt4.nc' + dataETOPO1 = Dataset(fileETOPO1) + # 获取ETOPO1网格 + self.latGrid1 = dataETOPO1.variables['y'][:] + self.lonGrid1 = dataETOPO1.variables['x'][:] + # 获取海深数据 + self.botGrid = -dataETOPO1.variables['z'][:] + self.STPath=STpath + return + + def clearVar(self): + """ + 清空变量 + """ + self.botDep = None + self.salRawPf = None + self.temRawPf = None + self.velRawPf = None + self.velInterpPf = None + self.velExtPf = None + self.velFullPf = None + self.isValid = True + return + + def set_timePeriod(self, timeIndex): + """ + 设置时间段 + """ + timeIndex = '01' + self.timeIndex = timeIndex + # 打开WOA18数据 + fileWOA18sal = self.STPath + '/woa18_A5B7_s' + timeIndex + '_04.nc' + fileWOA18tem = self.STPath + '/woa18_A5B7_t' + timeIndex + '_04.nc' + dataWOA18Sal = Dataset(fileWOA18sal) + dataWOA18Tem = Dataset(fileWOA18tem) + # 获取WOA18网格 + self.latGrid2 = dataWOA18Sal.variables['lat'][:] + self.lonGrid2 = dataWOA18Sal.variables['lon'][:] + # 获取深度数据 + self.depthGrid = dataWOA18Sal.variables['depth'][:] + # 获取盐度数据 + self.salGrid = np.squeeze(dataWOA18Sal.variables['s_an'][:]) + # 获取温度数据 + self.temGrid = np.squeeze( + dataWOA18Tem.variables['t_an'][:]) + self.clearVar() + return + + def set_coord(self, lat, lon): + """ + 设置坐标 + """ + self.lat = lat + self.lon = lon + self.clearVar() + return + + def interpBilinear(self, latId, lonId, dataGrid, dataTpye): + """ + 双线性插值 + """ + latId0 = int(np.ceil(latId)) + lonId0 = int(np.ceil(lonId)) + a = latId - latId0 + b = lonId - lonId0 + if (dataTpye == 1): + data0 = dataGrid[latId0, lonId0] + data1 = dataGrid[latId0+1, lonId0] + data2 = dataGrid[latId0+1, lonId0+1] + data3 = dataGrid[latId0, lonId0+1] + else: + data0 = dataGrid[:, latId0, lonId0] + data1 = dataGrid[:, latId0+1, lonId0] + data2 = dataGrid[:, latId0+1, lonId0+1] + data3 = dataGrid[:, latId0, lonId0+1] + data01 = (1-a)*data0+a*data1 + data32 = (1-a)*data3+a*data2 + data = (1-b)*data01+b*data32 + return data + + def normCoord(self, latGrid, lonGrid): + """ + 坐标单位化 + """ + lat0 = latGrid[0] + lon0 = lonGrid[0] + dlat = latGrid[1]-latGrid[0] + dlon = lonGrid[1]-lonGrid[0] + latId = (self.lat - lat0)/dlat + lonId = (self.lon - lon0)/dlon + return (latId, lonId) + + def get_bottomDepth(self): + """ + 获得海底深度 + """ + if (self.botDep == None): + # 单位化经纬度 + (latId, lonId) = self.normCoord(self.latGrid1, self.lonGrid1) + # 获取网格点海深 + self.botDep = self.interpBilinear(latId, lonId, self.botGrid, 1) + return self.botDep + + def get_salRawProfile(self): + """ + 获得原始盐度剖面 + """ + if (self.salRawPf == None): + botDep = self.get_bottomDepth() + # 单位化经纬度 + (latId, lonId) = self.normCoord(self.latGrid2, self.lonGrid2) + # 获取盐度剖面信息 + sal = self.interpBilinear(latId, lonId, self.salGrid, 2) + # 获取有效数据段 + dep = self.depthGrid[sal.mask == False] + sal = sal[sal.mask == False] + dep = dep.flatten() + sal = sal.flatten() + # 若为空，则为无效数据 + if sal.size <= 1: + self.isValid = False + # 剖面赋值 + salRawPf = Profile() + salRawPf.set_data(dep, sal) + salRawPf.set_coord(self.lat, self.lon) + salRawPf.set_bottomDepth(botDep) + self.salRawPf = salRawPf + return self.salRawPf + + def get_temRawProfile(self): + """ + 获得原始温度剖面 + """ + if (self.temRawPf == None): + botDep = self.get_bottomDepth() + # 单位化经纬度 + (latId, lonId) = self.normCoord(self.latGrid2, self.lonGrid2) + # 获取温度剖面信息 + tem = self.interpBilinear(latId, lonId, self.temGrid, 2) + # 获取有效数据段 + dep = self.depthGrid[tem.mask == False] + tem = tem[tem.mask == False] + dep = dep.flatten() + tem = tem.flatten() + # 若为空，则为无效数据 + if tem.size <= 1: + self.isValid = False + # 剖面赋值 + temRawPf = Profile() + temRawPf.set_data(dep, tem) + temRawPf.set_coord(self.lat, self.lon) + temRawPf.set_bottomDepth(botDep) + self.temRawPf = temRawPf + return self.temRawPf + + def get_velRawProfile(self): + """ + 获得原始声速剖面 + """ + if (self.velRawPf == None): + botDep = self.get_bottomDepth() + # 获取温盐深数据 + dep = self.get_salRawProfile().x + sal = self.get_salRawProfile().y + tem = self.get_temRawProfile().y + # 计算声速 + if self.isValid == True: + vel = soundSpeed(tem, sal, dep) + else: + dep = np.array([0]) + vel = np.array([0]) + # 剖面赋值 + velRawPf = Profile() + velRawPf.set_data(dep, vel) + velRawPf.set_coord(self.lat, self.lon) + velRawPf.set_bottomDepth(botDep) + self.velRawPf = velRawPf + return self.velRawPf + + def get_velInterpProfile(self): + """ + 获得插值后的声速剖面 + 将非等距离采样填充为深度间隔为1m的序列, 并应用Akima插值算法, 对数据进行插值 + """ + if (self.velInterpPf == None): + botDep = self.get_bottomDepth() + # 获得原始声速剖面数据 + dep = self.get_velRawProfile().x + vel = self.get_velRawProfile().y + if self.isValid == True: + # 对剖面进行垂向插值处理，将非等距离采样填充为深度间隔为1m的序列 + depInterp = np.arange(0, dep[-1]+1, 1) + # 应用Akima插值算法，对数据进行插值 + func = Akima1DInterpolator(dep, vel) + velInterp = func(depInterp) + else: + depInterp = np.array([0]) + velInterp = np.array([0]) + # 剖面赋值 + velInterpPf = Profile() + velInterpPf.set_data(depInterp, velInterp) + velInterpPf.set_coord(self.lat, self.lon) + velInterpPf.set_bottomDepth(botDep) + self.velInterpPf = velInterpPf + return self.velInterpPf + + def get_velExtProfile(self): + """ + 获得延拓后的声速剖面 + """ + if (self.velExtPf == None): + botDep = self.get_bottomDepth() + if self.isValid == True: + # 获得原始声速剖面数据 + dep = self.get_velRawProfile().x + vel = self.get_velRawProfile().y + # 获得剖面最低处温盐值 + tem = self.get_temRawProfile().y[-1] + sal = self.get_salRawProfile().y[-1] + # 延拓部分深度序列 + depExt = np.arange(dep[-1]+1, botDep+1) + # 按照声速公式延拓，假设温盐不变，仅深度变化 + velExt = soundSpeed(tem, sal, depExt) + else: + depExt = np.array([0]) + velExt = np.array([0]) + # 剖面赋值 + velExtPf = Profile() + velExtPf.set_data(depExt, velExt) + velExtPf.set_coord(self.lat, self.lon) + velExtPf.set_bottomDepth(botDep) + self.velExtPf = velExtPf + return self.velExtPf + + def get_velFullProfile(self): + ''' + 获得全海深声速剖面 + ''' + if (self.velFullPf == None): + botDep = self.get_bottomDepth() + if self.isValid == True: + # 插值后的速度剖面 + depInterp = self.get_velInterpProfile().x + velInterp = self.get_velInterpProfile().y + # 延拓后的速度剖面 + depExt = self.get_velExtProfile().x + velExt = self.get_velExtProfile().y + # 全海深声速剖面 + depFull = np.concatenate((depInterp, depExt)) + velFull = np.concatenate((velInterp, velExt)) + else: + depFull = np.array([0]) + velFull = np.array([0]) + # 剖面赋值 + velFullPf = Profile() + velFullPf.set_data(depFull, velFull) + velFullPf.set_coord(self.lat, self.lon) + velFullPf.set_bottomDepth(botDep) + self.velFullPf = velFullPf + return self.velFullPf + + def export_velFullProfile_txt(self, filePath): + ''' + 速度剖面导出txt文件 + ''' + velPf = self.get_velFullProfile() + lat = velPf.lat + lon = velPf.lon + botDep = velPf.botDep + dep = velPf.x + vel = velPf.y + # 导出文本 + line1 = 'lat[degree north], {0:>7.4f}, lon[degree east], {1:>7.4f}, BottomDepth[m], {2:>5.0f}\n'.format( + lat, lon, botDep) + line2 = 'depth[m], velocity[m/s]' + np.savetxt(filePath, np.stack((dep, vel), -1), + fmt='%.5e', delimiter=',', comments='', header=line1+line2) + + def export_velFullProfile_nc(self, filePath): + ''' + 速度剖面导出nc文件 + ''' + velPf = self.get_velFullProfile() + lat = velPf.lat + lon = velPf.lon + botDep = velPf.botDep + dep = velPf.x + vel = velPf.y + + data = Dataset(filePath, 'w', format='NETCDF4') + data.createDimension('lon', 1) + data.createDimension('lat', 1) + data.createDimension('botDep', 1) + data.createDimension('dep', dep.size) + data.createDimension('vel', vel.size) + + data.createVariable('lon', 'f', ('lon')) + data.createVariable('lat', 'f', ('lat')) + data.createVariable('botDep', 'f', ('botDep')) + data.createVariable('dep', 'f', ('dep')) + data.createVariable('vel', 'f', ('vel')) + + data.variables['lat'][:] = lat + data.variables['lon'][:] = lon + data.variables['botDep'][:] = botDep + data.variables['dep'][:] = dep + data.variables['vel'][:] = vel + + data.close() diff --git a/pyat/ProfileRead.py b/pyat/ProfileRead.py index 82037db..f16bace 100644 --- a/pyat/ProfileRead.py +++ b/pyat/ProfileRead.py @@ -1,9 +1,9 @@ import unicodedata import numpy as np -from pyat.ProfileDataType import Profile +from ProfileDataType import Profile from scipy.interpolate import interp1d from scipy.signal import butter, filtfilt -from pyat.DataBase import DataBase +from DataBase import DataBase ''' ************************************************************ diff --git a/pyat/ProfileTool.py b/pyat/ProfileTool.py index 01009cb..ff9ef8b 100755 --- a/pyat/ProfileTool.py +++ b/pyat/ProfileTool.py @@ -1,6 +1,6 @@ import numpy as np from scipy.signal import find_peaks -from pyat.ProfileDataType import Channel, SpringLayer +from ProfileDataType import Channel, SpringLayer ''' ************************************************************ diff --git a/pyat/RANDIcore.py b/pyat/RANDIcore.py index 13455a0..26bf8bf 100644 --- a/pyat/RANDIcore.py +++ b/pyat/RANDIcore.py @@ -1,13 +1,13 @@ import os from multiprocessing import Pool from functools import partial -from time import time +import time from shutil import rmtree import numpy as np from scipy.interpolate import interp1d from copy import deepcopy -from pyat import ramRW_new as ramRW -from pyat.DataBase import DataBase,soundSpeed +import ramRW_new as ramRW +from DataBase import DataBase class BathyM: @@ -124,7 +124,7 @@ def RANDI_GetEnv(data, coordS, coordR=None, R=None, azi=None): z_ssp = np.append(z_ssp, max(bathym.d)) sal_m = np.append(sal_m, sal_m[-1]) tem_m = np.append(tem_m, tem_m[-1]) - c_ssp = soundSpeed(tem_m, sal_m, z_ssp) + c_ssp = DataBase.soundSpeed(tem_m, sal_m, z_ssp) ssp = SSP_(0, z_ssp, c_ssp) # plt.plot(c_ssp, z_ssp) # plt.gca().invert_yaxis() diff --git a/pyat/WGNPd.py b/pyat/WGNPd.py index 6ff987a..6ffd089 100755 --- a/pyat/WGNPd.py +++ b/pyat/WGNPd.py @@ -1,7 +1,7 @@ """ Wind Generated Noise Prediction """ import numpy as np from scipy.interpolate import interp1d -from pyat import DataBase as db +import DataBase as db import matplotlib.pyplot as plt class MdlPara(): diff --git a/pyat/bellhop.py b/pyat/bellhop.py index 0562ec4..7de2d15 100644 --- a/pyat/bellhop.py +++ b/pyat/bellhop.py @@ -1,8 +1,8 @@ -from pyat.readwrite import write_env, read_shd, get_rays -from pyat.env import Pos, Source, Dom, cInt, SSPraw, SSP, HS, BotBndry, TopBndry, Bndry, Box, Beam +from readwrite import write_env, read_shd, get_rays +from env import Pos, Source, Dom, cInt, SSPraw, SSP, HS, BotBndry, TopBndry, Bndry, Box, Beam from os import system import numpy as np -from pyat.config import AtBinPath +from config import AtBinPath def write_ssp(sspfile, ssp, bathm, NZmax): diff --git a/pyat/config.json b/pyat/config.json index 801dbb5..d65e1d1 100644 --- a/pyat/config.json +++ b/pyat/config.json @@ -1,3 +1,3 @@ { - "AtBinPath": "/home/shunli/pro/pyat/at/bin" + "AtBinPath": "/home/shunli/pro/at/bin" } diff --git a/pyat/czcore.py b/pyat/czcore.py index e55dcf0..e0dc388 100644 --- a/pyat/czcore.py +++ b/pyat/czcore.py @@ -2,13 +2,13 @@ from multiprocessing import Process from os import system import numpy as np -from pyat.AcousticPara import GetEnv, Coord +from AcousticPara import GetEnv, Coord from scipy.signal import savgol_filter, medfilt -from pyat.DataBase import DataBase -from pyat.readwrite import write_env, write_bathy, read_shd, get_rays -from pyat.env import Pos, Source, Dom, cInt, SSPraw, SSP, HS, BotBndry, TopBndry, Bndry, Box, Beam +from DataBase import DataBase +from readwrite import write_env, write_bathy, read_shd, get_rays +from env import Pos, Source, Dom, cInt, SSPraw, SSP, HS, BotBndry, TopBndry, Bndry, Box, Beam import matplotlib.pyplot as plt -from pyat.config import AtBinPath +from config import AtBinPath file_cz_data = open('cz_data.txt', 'w') @@ -47,7 +47,7 @@ def calZmax(ssp, sed): return Zmax, ssp_idx -def call_Bellhop(freq, sd, rd, bathm, ssp, sed, base,azi): +def call_Bellhop(freq, sd, bathm, ssp, sed, base,azi): # Source and receiving position filename = 'cz'+str(azi) Rmax = bathm.r[-1] # unit: km @@ -117,7 +117,7 @@ def call_Bellhop(freq, sd, rd, bathm, ssp, sed, base,azi): return Pos1, TL -def call_Bellhop_Rays(freq, sd, rd, bathm, ssp, sed, base,azi): +def call_Bellhop_Rays(freq, sd, bathm, ssp, sed, base,azi): # Source and receiving position filename = 'cz_ray'+str(azi) Rmax = bathm.r[-1] # unit: km @@ -265,7 +265,7 @@ def call_hjq(r, TL): return czrangewidth_list -def call_fangwei(freq, sd, rd, bathm, ssp, sed, base, azi, isPlot=False): +def call_fangwei(freq, sd, bathm, ssp, sed, base, azi, isPlot=False): czdetail = CzDetail("", [], []) last = len(ssp[0].c) - 1 # if ssp[0].c[0] > ssp[0].c[last]: @@ -274,9 +274,9 @@ def call_fangwei(freq, sd, rd, bathm, ssp, sed, base, azi, isPlot=False): # else: # file_cz_data.write('\n'"直达会聚区：") sed = None - rays_total = call_Bellhop_Rays(freq, sd, rd, bathm, ssp, sed, base, azi) + rays_total = call_Bellhop_Rays(freq, sd, bathm, ssp, sed, base, azi) Rays = find_cvgcRays(rays_total) - [Pos, TL] = call_Bellhop(freq, sd, rd, bathm, ssp, sed, base, azi) + [Pos, TL] = call_Bellhop(freq, sd, bathm, ssp, sed, base, azi) [x, x, x, x, Pos, pressure] = read_shd('cz'+str(azi)+'.shd') TL = -10 * np.log10(np.square(np.abs(pressure))) # Transmission Loss # Plot @@ -297,9 +297,8 @@ def call_fangwei(freq, sd, rd, bathm, ssp, sed, base, azi, isPlot=False): return Pos.r.range, Pos.r.depth, TL[0, 0, :, :], bathm, Rays, czdetail -def call_cz(database, freq, lat, lon, azi, sourceDepth=10, receiveDepth=10, isPlot=False): +def call_cz(database, freq, lat, lon, azi, sourceDepth=10, isPlot=False): sd = np.array([sourceDepth]) # Source depth - rd = np.linspace(0, receiveDepth, 351) # Receiving depth results = [] ranges, depths, TL, bathym, Rays = [], [], [], [], [] @@ -311,7 +310,7 @@ def call_cz(database, freq, lat, lon, azi, sourceDepth=10, receiveDepth=10, isPl # 不会出现会聚区 ddd=[] else: - ranges, depths, TL, bathym, Rays, czdetail = call_fangwei(freq, sd, rd, bathm, ssp, sed, base, azi=theta[i],isPlot=True) + ranges, depths, TL, bathym, Rays, czdetail = call_fangwei(freq, sd, bathm, ssp, sed, base, azi=theta[i],isPlot=isPlot) czdetail.descript = descripts[i] results.append(CzData(theta[i], ranges, depths, TL, bathym, Rays, czdetail)) return results @@ -325,7 +324,7 @@ def call_cz(database, freq, lat, lon, azi, sourceDepth=10, receiveDepth=10, isPl if np.mean(bathm.d) < 2000: return results else: - ranges, depths, TL, bathym, Rays, czdetail = call_fangwei(freq, sd, rd, bathm, ssp, sed, base, + ranges, depths, TL, bathym, Rays, czdetail = call_fangwei(freq, sd, bathm, ssp, sed, base,azi, isPlot=isPlot) czdetail.descript = "{:.1f}°方向".format(azi) results.append(CzData(0, ranges, depths, TL, bathym, Rays, czdetail)) diff --git a/pyat/krakenc.py b/pyat/krakenc.py index 6d3226b..93e04e8 100755 --- a/pyat/krakenc.py +++ b/pyat/krakenc.py @@ -1,8 +1,8 @@ from os import system import numpy as np -from pyat.readwrite import write_env, write_fieldflp, read_shd -from pyat.env import Pos, Source, Dom, cInt, SSPraw, SSP, HS, BotBndry, TopBndry, Bndry -from pyat.config import AtBinPath +from readwrite import write_env, write_fieldflp, read_shd +from env import Pos, Source, Dom, cInt, SSPraw, SSP, HS, BotBndry, TopBndry, Bndry +from config import AtBinPath def calZmax(ssp, sed): d = np.array([]) diff --git a/pyat/ram.py b/pyat/ram.py index d6f18ce..dfefe10 100755 --- a/pyat/ram.py +++ b/pyat/ram.py @@ -1,7 +1,7 @@ -from pyat.ramRW import PosRAM, PROF, SSPRAM, write_env_RAM, readTL_RAM +from ramRW import PosRAM, PROF, SSPRAM, write_env_RAM, readTL_RAM from os import system import numpy as np -from pyat.config import AtBinPath +from config import AtBinPath def call_ram(freq, sd, rd, bathm, ssp, sed): ''' ********************************************************************************* ''' diff --git a/pyat/ramRW.py b/pyat/ramRW.py index 4e5c97d..2c2950e 100755 --- a/pyat/ramRW.py +++ b/pyat/ramRW.py @@ -1,4 +1,4 @@ -from pyat.env import * +from env import * import numpy as np def write_env_RAM(TitleEnv, freq, pos, bathym, ssp, envfil = "ram.in"): diff --git a/pyat/ramRW_new.py b/pyat/ramRW_new.py index ea32dc6..a1a15d2 100644 --- a/pyat/ramRW_new.py +++ b/pyat/ramRW_new.py @@ -1,4 +1,4 @@ -from pyat.env import * +from env import * import numpy as np diff --git a/pyat/readwrite.py b/pyat/readwrite.py index f1cc918..e444772 100755 --- a/pyat/readwrite.py +++ b/pyat/readwrite.py @@ -2,7 +2,7 @@ import numpy as np from scipy.io import loadmat import os from struct import unpack -from pyat.env import Source, Dom, Pos, cInt, Ice, SSPraw, SSP, HS, BotBndry, TopBndry, Bndry, Box, Beam, Modes, Eigenray +from env import Source, Dom, Pos, cInt, Ice, SSPraw, SSP, HS, BotBndry, TopBndry, Bndry, Box, Beam, Modes, Eigenray import re from matplotlib import pyplot as plt from math import floor diff --git a/pyat/tlcore.py b/pyat/tlcore.py index bbd8c15..d698707 100644 --- a/pyat/tlcore.py +++ b/pyat/tlcore.py @@ -1,9 +1,9 @@ import numpy as np -from pyat.AcousticPara import GetEnv, Coord -from pyat.DataBase import DataBase -from pyat.bellhop import call_Bellhop -from pyat.krakenc import call_krakenc -from pyat.ram import call_ram +from AcousticPara import GetEnv, Coord +from DataBase import DataBase +from bellhop import call_Bellhop +from krakenc import call_krakenc +from ram import call_ram import matplotlib.pyplot as plt def call_tl(database, freq, sourceDepth, sourceLat, sourceLon, receiveDepth, diff --git a/rl.py b/rl.py index c8d8d78..68dfdd1 100755 --- a/rl.py +++ b/rl.py @@ -2,6 +2,8 @@ import warnings warnings.filterwarnings('ignore') import argparse, json +import os, sys +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))+'/pyat') def _argparse(): parser = argparse.ArgumentParser(description='混响级计算') @@ -33,7 +35,7 @@ def main(): r = float(paramData["range"]) outParam = paramData["outParam"] - from pyat.rlcore import call_rl + from rlcore import call_rl [rlss, rlsb, rlsv] = call_rl(v,SL,Sv,freq,tau,theta,l,r) # [rlss,rlsb] = call_rl(5,170,55,10,9.5,0.3,182.5) diff --git a/tl.py b/tl.py index 5e67943..29630d2 100644 --- a/tl.py +++ b/tl.py @@ -3,6 +3,8 @@ import warnings warnings.filterwarnings('ignore') import argparse, json from common import NoIndent, MyEncoder +import os, sys +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))+'/pyat') def _argparse(): parser = argparse.ArgumentParser(description='tl client') @@ -40,7 +42,8 @@ def main(): png = paramData["png"] outParam = paramData["outParam"] - from pyat.tlcore import call_tl + from DataBase import DataBase + from tlcore import call_tl import numpy as np # 定义时间段 diff --git a/tl_realtime.py b/tl_realtime.py index 8b6156b..572d152 100644 --- a/tl_realtime.py +++ b/tl_realtime.py @@ -3,6 +3,8 @@ import warnings warnings.filterwarnings('ignore') import argparse, json from common import NoIndent, MyEncoder +import os, sys +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))+'/pyat') def _argparse(): parser = argparse.ArgumentParser(description='tl realtime client') @@ -61,8 +63,8 @@ def main(): from scipy.interpolate import Akima1DInterpolator import numpy as np - from pyat.AcousticPara import BathyM, Base, Sed, SSP_ - from pyat.tlcore import call_Bellhop, call_krakenc, call_ram + from AcousticPara import BathyM, Base, Sed, SSP_ + from tlcore import call_Bellhop, call_krakenc, call_ram import matplotlib.pyplot as plt bathym, ssp, sed, base = [], [], [], [] diff --git a/wgnp.py b/wgnp.py index 4d4c169..180edb9 100644 --- a/wgnp.py +++ b/wgnp.py @@ -2,6 +2,8 @@ import warnings warnings.filterwarnings('ignore') import argparse, json +import os, sys +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))+'/pyat') def _argparse(): parser = argparse.ArgumentParser(description='Wind Generated Noise Prediction') @@ -32,8 +34,7 @@ def main(): png = paramData["png"] outParam = paramData["outParam"] - from pyat.WGNPd import WGNPd - from pyat.DataBase import DataBase + from WGNPd import WGNPd import matplotlib.pyplot as plt import numpy as np