Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
383 commits
Select commit Hold shift + click to select a range
347f16a
added yaml files
SBFRF Jul 15, 2019
36732d8
Merge branch 'SWASH' of github.com:SBFRF/cmtb into SWASH
SBFRF Jul 15, 2019
50a284d
updated inspection
SBFRF Jul 15, 2019
078b2e4
updated ww3, preprocessing waves through rotation, but not interpolation
SBFRF Jul 15, 2019
5201d13
updated repository submodules
SBFRF Jul 15, 2019
4d2208e
proved in ww3 scratch that interp2D can do the same thing as the inde…
SBFRF Jul 16, 2019
b9e5a59
updated sub repos
SBFRF Jul 22, 2019
43efc84
updated idea files
SBFRF Jul 22, 2019
75bfee3
updated git ignore with idea file
SBFRF Jul 22, 2019
4e28303
updated ww3 branch, should be operational for waves and bathy to this…
SBFRF Jul 23, 2019
0c2bb2d
begining to update cmsFlow architecture
SBFRF Aug 12, 2019
1e7e72e
minor doc string updates
SBFRF Aug 14, 2019
7268136
updates for new structure with CMS flow, before structured meeting ab…
SBFRF Aug 15, 2019
e695ac0
pre commit before heading to deewey
SBFRF Aug 22, 2019
d843881
updating and creating ww3 workflow
SBFRF Aug 31, 2019
3910ec0
maybe fixed merge issues
SBFRF Aug 31, 2019
361b160
updated docstring preference
SBFRF Aug 31, 2019
6385fed
updated ww3 with new cleaner work flow, now seperate from cms
SBFRF Sep 1, 2019
7e313fb
updated ww3 workflow with namelist files for ww3 runs
SBFRF Sep 8, 2019
4e67289
updated front of work flow to be clean, now going to try to break apa…
gb96 Nov 13, 2019
bc43548
cleaned up make nc docstrings and formatting
SBFRF Nov 13, 2019
c4d9265
cleaned up docstrings, probably should remove plotting library from repo
SBFRF Nov 13, 2019
0a62c1b
added plot unstructured field function (could be used as a try catch …
SBFRF Nov 13, 2019
c2bbc5a
updated netCDF yaml to save cold/hot start
SBFRF Nov 17, 2019
4259890
working CMS Flow
SBFRF Dec 19, 2019
437b211
updated yaml for storing cmsf data
SBFRF Dec 30, 2019
02713b4
updated formating minor
SBFRF Jan 2, 2020
7bdd054
updates to ww3 workflow
SBFRF Jan 2, 2020
d519604
updated function name in unstructured (but cMS ) to ww3 ?
SBFRF Jan 2, 2020
e4d473d
updated idea files for development
SBFRF Jan 3, 2020
b67534b
updated .idea files
SBFRF Jan 3, 2020
14990a7
resolved merge conflict
SBFRF Jan 3, 2020
8be94e8
updated work before computer crashed
SBFRF Jan 3, 2020
b0ea13e
updated cloudbreak after lighthouse failure
SBFRF Jan 3, 2020
cb12deb
Merge branch 'ww3' of github.com:SBFRF/cmtb into ww3
SBFRF Jan 3, 2020
95fff37
added boundary file to grid
SBFRF Jan 3, 2020
5382243
Merge branch 'ww3' of github.com:SBFRF/cmtb into ww3
SBFRF Jan 3, 2020
9ed2eee
updated axis in op-plots other work flow mods for ww3
SBFRF Jan 6, 2020
d1bd842
updated scratch file for ww3
SBFRF Jan 6, 2020
793b870
updated ww3 to fully prep, haven't tested model on generated input
SBFRF Jan 9, 2020
b7b46c1
updated git ignore
SBFRF Jan 9, 2020
c38e4a3
updated git ignorme
SBFRF Jan 9, 2020
3a40ef0
updated minor changes to work flow
SBFRF Feb 19, 2020
74d6061
fixed merge conflicts
SBFRF Mar 31, 2020
d05f48a
Merge branch 'cmsf-merge' into development
SBFRF Mar 31, 2020
298862f
premerge commit
SBFRF Mar 31, 2020
5a24de1
working c2shore, no bed reset
SBFRF Apr 10, 2020
1f92e33
updated .gitignore file'
SBFRF Apr 10, 2020
53977f8
preprocessing for WW3 unstructured is working properly except for ww3…
SBFRF Apr 14, 2020
efc253b
added .cmtbsettings file
SBFRF Apr 14, 2020
74cc816
updated cms
SBFRF Apr 16, 2020
03e7490
running WW3 simulation outside of work flow
SBFRF Apr 16, 2020
e5f6c27
first mechanically working version of c2shore work flow including hot…
SBFRF Apr 21, 2020
26cdd7e
fixed merge conflict
SBFRF Apr 22, 2020
bad5077
Merge branch 'newCMS' into development
SBFRF Apr 22, 2020
599d416
updated ww3 through to data load, to begin post -processing
SBFRF Apr 27, 2020
73380e2
updated to new getdata testbed version
SBFRF Apr 27, 2020
9a98211
updated SWASH branch, should be working properly
SBFRF Apr 27, 2020
a7b6841
updated swash, confirmed running
SBFRF Apr 28, 2020
7c7e074
updated swash work flow to be more similar to that of ww3 and CMS
SBFRF Apr 28, 2020
6b7aaa2
post processing for ww3 begun
SBFRF May 7, 2020
6e94039
merged dev into swash branch to remove conflict
SBFRF May 7, 2020
d2424e7
Merge branch 'SWASH' into development
SBFRF May 7, 2020
e2ed0cf
inital funwave commit
SBFRF May 7, 2020
ad3cb95
updated which getdata needed
SBFRF May 7, 2020
d9f85f3
preliminiary work flow for ww3
SBFRF May 21, 2020
015074a
fixed syntax errors with ww3 setup, stil. need to test
SBFRF May 21, 2020
415627e
Copied frontBackSWASH to frontBackFUNWAVE
GabySalgado May 28, 2020
38f2e6b
Copied RunWorkFlow_SWASH to RunWorkFlow_FUNWAVE
GabySalgado May 28, 2020
d429fd6
updated modified funwave workflow
SBFRF May 29, 2020
de4d578
layed out inital workflow for gaby and identified areas in code for g…
SBFRF May 29, 2020
7f6a714
updated preprocessing example to include updated info based on new in…
SBFRF May 29, 2020
a6d483d
updated fully new STWAVE implementation to get in line with other lar…
SBFRF Jun 2, 2020
10684b1
Created FUNWAVE's grid folder with 1d bathy and station files examples
GabySalgado Jun 3, 2020
565783c
Merge branch 'FUNWAVE' of github.com:SBFRF/cmtb into FUNWAVE
GabySalgado Jun 3, 2020
fb696af
updated variable names
SBFRF Jun 3, 2020
87d918f
Copied FUNWAVE.yml from SWAHS's example yml file (paths used here are…
GabySalgado Jun 3, 2020
2f0f4eb
added bathy fusion module for posterity
SBFRF Jun 3, 2020
f9132e9
added pickles to grids folder
GabySalgado Jun 4, 2020
360f9e7
Added FUNWAVE_Input_example.yml file (the paths in it are for Gaby's …
GabySalgado Jun 4, 2020
e5cf67d
Changed function names from SWASH to FUNWAVE
GabySalgado Jun 4, 2020
8ded98f
added 'TODO' comment to fileHandling.py
GabySalgado Jun 4, 2020
a9e319a
Changed input-variables for FunwaveSimSetup, an fixed variable names …
GabySalgado Jun 5, 2020
5b770cc
Changed input-variables for FunwaveSimSetup
GabySalgado Jun 5, 2020
43e4ae8
added other.xml:
SBFRF Jun 8, 2020
38bc228
updated ww3
SBFRF Jun 8, 2020
671ee76
updated funwave work flow
SBFRF Jun 8, 2020
743398e
Merge branch 'FUNWAVE' of github.com:SBFRF/cmtb into FUNWAVE
SBFRF Jun 8, 2020
955e7f1
updated example working input yaml for funwave
SBFRF Jun 11, 2020
ca0ef95
updated example yaml
SBFRF Jun 11, 2020
511aecd
updated funwave work flow to manually load bathy/topo fusion files fr…
SBFRF Jun 11, 2020
e1faa76
fixed bathy file path issue
SBFRF Jun 12, 2020
495a86b
updated FUNWAVE workflow for spectral input
SBFRF Jun 12, 2020
a7f7b69
updated stwave work flow to return appropraite data
SBFRF Jun 16, 2020
b85996b
Added 1D or 2D to grid key
GabySalgado Jun 24, 2020
fa7a173
Debugging Writting spectra function
GabySalgado Jun 24, 2020
362d3a4
Added 1D or 2D grid 'if' statement before calling prep_swashbathy fun…
GabySalgado Jun 24, 2020
7a2e3b0
Finished fixing prep_SwashBathy for FUNWAVE
GabySalgado Jun 25, 2020
e210f3f
Changed timeStamp to dateString
GabySalgado Jul 2, 2020
63c5a77
working STWAVE restructured work flow
SBFRF Jul 9, 2020
9952b72
fixed spectra 2d writting function. must add phases to function
GabySalgado Jul 9, 2020
949e25f
fixed example input file for funwave
SBFRF Jul 9, 2020
0cd655f
Merge branch 'funwaveNEW' of github.com:SBFRF/cmtb into funwaveNEW
SBFRF Jul 9, 2020
a215e6b
added phase information to frontback/prepdata. reworked the work flo…
SBFRF Jul 10, 2020
94807ee
spectra functions phases verification
GabySalgado Jul 15, 2020
d1aaa73
merging stuff
GabySalgado Jul 15, 2020
e938623
deleted yml file
GabySalgado Jul 15, 2020
92fcea1
trying to merge frontbackFUNWAVE
GabySalgado Jul 15, 2020
5be8b3a
fixed issue with reading new yml format with model settings
thesser1 Jul 16, 2020
e70f4de
Merge pull request #23 from SBFRF/swash_docker
thesser1 Jul 16, 2020
aff2c4a
new link to testbedutils hash
thesser1 Jul 16, 2020
9aa2ebc
pulling nprocess and runtime out of hard code and fixed a directory n…
thesser1 Jul 17, 2020
7b66d7e
updating prepdata once commits are merged on that repo
thesser1 Jul 17, 2020
1b732bc
updated stwave tested and runs for UQ work
SBFRF Jul 17, 2020
b29d4bf
Merge branch 'development' of github.com:SBFRF/cmtb into development
SBFRF Jul 17, 2020
92ae2a1
resolved shape issue on prep spectra. num frequencies not tied to df …
SBFRF Jul 17, 2020
be4e4f7
working veersion of ww3
SBFRF Jul 21, 2020
58397eb
forcing check on CHL data server for wind query
SBFRF Jul 21, 2020
41ffeec
updates for reading the msh without errors
thesser1 Jul 23, 2020
8af2b35
small fixes to ww3 setup
thesser1 Jul 23, 2020
640f770
fixed merge
thesser1 Jul 23, 2020
6939a81
updated README to document required python modules and updating prepd…
thesser1 Jul 23, 2020
d5d8bd4
merging to Spicer's recent work (07/29/2020)
GabySalgado Jul 29, 2020
0831b8c
merging to Spicer's recent work (07/29/2020)
GabySalgado Jul 29, 2020
a9e5ae5
passing runtime through to prep data spec for adjusting df
thesser1 Jul 29, 2020
1114b83
updating prepdata
thesser1 Jul 31, 2020
81a14bc
debugging funwave's input fucntion
GabySalgado Aug 6, 2020
7d9eb07
Adding variables and assertion to funwave input function
GabySalgado Aug 6, 2020
ac240b5
updated prepbathy for FUNWAVE sims
SBFRF Aug 12, 2020
bdf0bbc
debugging bathy file code
GabySalgado Aug 12, 2020
d1465a2
fixing merging conflict
GabySalgado Aug 12, 2020
64a89ea
fixed ybounds in grid generation function
GabySalgado Aug 12, 2020
e4bf709
added offshore extension to grid file generation function
GabySalgado Aug 12, 2020
f575704
debugging gridDict issues with ybounds
GabySalgado Aug 13, 2020
18f455e
Checking if my = 3 fixes ybounds issue
GabySalgado Aug 13, 2020
f6cb1c3
only one value in freq_list
GabySalgado Aug 13, 2020
00111ce
Fixed px and py computation, depending on grid type (1d or 2d)
GabySalgado Aug 13, 2020
94dd078
fixed weird pointer related error for bathy processing in which bathy…
SBFRF Aug 13, 2020
9d3405a
fixed merge error
SBFRF Aug 13, 2020
c499543
checking if files are written correctly
GabySalgado Aug 13, 2020
0b8e661
checking that files are written correctly
GabySalgado Aug 13, 2020
1a3e1d5
cleaning up Debug Gaby messages
GabySalgado Aug 13, 2020
896ef5c
changed nprocessors to integer in mpirun (line 107)
GabySalgado Aug 13, 2020
a40c765
updated some things
SBFRF Aug 14, 2020
3e1bc84
Merge branch 'funwaveNEW' of github.com:SBFRF/cmtb into funwaveNEW
SBFRF Aug 14, 2020
17f30a8
updated post processing and run work flow minorly:
SBFRF Aug 19, 2020
9bc2074
added offshore extension to xFRF for postprocessing
GabySalgado Aug 19, 2020
5384d06
mpirun line for funwave
GabySalgado Aug 19, 2020
90aa1f3
ficing merging issues on runworkflow...
GabySalgado Aug 19, 2020
09ec1f6
Debugging upload funwave's station files function
GabySalgado Aug 19, 2020
f77925d
Setting up loadFUNWAVE_stations
GabySalgado Aug 20, 2020
c49fa89
finished verifying simData dictionary. working on simMeta dictionary
GabySalgado Aug 20, 2020
4601c60
debugging computation of fspec and freq
GabySalgado Aug 21, 2020
855f709
changed funwave station time from float to datetime
GabySalgado Aug 21, 2020
d4e0427
total, SeaSwellStats and IG stats runs well
GabySalgado Aug 21, 2020
f50d9de
Added simMeta dictionary to funwaveAnalysis (without simWalltime and …
GabySalgado Aug 21, 2020
2687746
updated funwave work flow with minor changes to test simulation runni…
SBFRF Aug 28, 2020
d7ad73b
fixed run for crunchy.... model runs
SBFRF Aug 28, 2020
46fea0d
debuging frontBackFUNWAVE. Added nSubSample.
GabySalgado Sep 2, 2020
0c642a1
Adjusted Funwave results to FRF coordinates
GabySalgado Sep 3, 2020
f6bbd92
debugging postprocess
GabySalgado Sep 3, 2020
e0b186c
fixed figure path issue
GabySalgado Sep 17, 2020
69898e4
fixing plot land issue
GabySalgado Sep 17, 2020
1476d48
fixed issues with lines 261-273 of frontbackfunwave
GabySalgado Sep 23, 2020
97f7783
fixed land color fill in eta images
GabySalgado Sep 23, 2020
445f361
fixing yml dictionary keys
GabySalgado Sep 24, 2020
ac4b79a
fixed fill land issues
GabySalgado Sep 24, 2020
84d72b1
fixed fill land issues
GabySalgado Sep 24, 2020
ba96035
fixing time series plot issue
GabySalgado Sep 28, 2020
b373681
updated funwaveNEW with ongoing updates
SBFRF Nov 2, 2020
cb147f2
updated model executable calls in .cmtbsettings
SBFRF Nov 2, 2020
3d51d68
merge conflict resolved (except prepdata)
SBFRF Nov 2, 2020
4e9b8d7
Added dep.out reading functions
GabySalgado Dec 1, 2020
a26cd43
fixed simulation folder name/date format
GabySalgado Dec 1, 2020
c083576
plot time series
GabySalgado Dec 2, 2020
a774e53
started working on netcdf
GabySalgado Dec 2, 2020
c33ccac
added find dep.out/depth.txt feature
GabySalgado Dec 2, 2020
d79b698
updates to ww3 run workflow
thesser1 Dec 9, 2020
ae63a04
moved generic work flow to pull from new wrr module
SBFRF Dec 9, 2020
f4decd6
reworking new workflow towards using wrr module
SBFRF Dec 10, 2020
1f01c6e
updated prepdata submodule to class
SBFRF Dec 10, 2020
c52d3d0
Working wrr structure through write functions
SBFRF Dec 17, 2020
980ba61
work flow with default settings, should run
SBFRF Dec 18, 2020
977528b
clean commit writes all files, errors on boundary input prep bounc, m…
SBFRF Dec 18, 2020
89028a8
fixing funwave merge
SBFRF Dec 28, 2020
bc0b942
Merge pull request #26 from SBFRF/funwaveNEW
SBFRF Dec 28, 2020
3a29393
fixed merge conflicts moving dev into ww3
SBFRF Dec 28, 2020
55da328
Merge branch 'ww3' into development
SBFRF Dec 28, 2020
7866a78
working on variables for netcdf function
GabySalgado Dec 28, 2020
7e30358
commiting changes before git pulling
GabySalgado Dec 28, 2020
3b4a6cb
updated sub repos
SBFRF Dec 28, 2020
1e94678
updated prep data
SBFRF Dec 28, 2020
7ee64d1
Merge branch 'development' into swash_update
SBFRF Dec 28, 2020
f4c9ce3
Merge branch 'swash_update' into development
SBFRF Dec 28, 2020
367963d
updated commit hash for prepdata submodule to be most recent
SBFRF Dec 28, 2020
5d3d1a3
Merge branch 'funwaveNEW' into development
SBFRF Dec 28, 2020
7ee3f73
resoved merge conflict
SBFRF Dec 28, 2020
c31c16a
Merge branch 'development' into v2
SBFRF Dec 28, 2020
9477e45
updated ww3 example input
SBFRF Dec 28, 2020
ad01b67
updated supporting repo-s
SBFRF Dec 28, 2020
3029615
updated work flow with new testbedutil containing TDScrawler, exposed…
SBFRF Dec 29, 2020
b95dbc1
resolved workflow to working on ww3
SBFRF Jan 1, 2021
d2e16e6
working towards runnig swash, added a few notes and seperate function…
SBFRF Jan 1, 2021
6e9b0ad
updated prep-sub repo
SBFRF Jan 1, 2021
281ab30
WORKS through loadallfiles for WW3, added if statement for post proce…
SBFRF Jan 2, 2021
3e31cb3
added swash runs to frontback new and renamed the prep spec for swash
SBFRF Jan 3, 2021
11b8522
added model name to swash preprocessor
SBFRF Jan 3, 2021
1e82b87
got swash model to run, but throwing error'
SBFRF Jan 3, 2021
10830a7
working swash to post processing
SBFRF Feb 9, 2021
96645ec
Merge branch 'v2' into sb/swash
SBFRF Feb 9, 2021
284aed6
Merge pull request #31 from SBFRF/sb/swash
SBFRF Feb 9, 2021
a2added
add notebooks for cshore and ww3
thesser1 Feb 22, 2021
cd95b61
updates for cshore
thesser1 Jun 25, 2021
ef30626
comment out inputOutput"
thesser1 Jun 25, 2021
ff2c6b0
update getdata call
thesser1 Jun 25, 2021
82ddde5
fixing up cshore running, pbs scripting, and generally clean up
Jun 28, 2021
5380d1d
updates to run ww3 with pbs
thesser1 Jul 1, 2021
cf103c5
removing pdb
Jul 1, 2021
f212e3c
adding pbsflag to ww3
Jul 1, 2021
018da1e
added hpcCores option
thesser1 Jul 1, 2021
fd796ca
updates for simplifying model run. also adds option for testname
Jul 1, 2021
1a49acd
updates for cshore runs
thesser1 Jul 1, 2021
45a3567
changed default ww3 dirbands
Jul 2, 2021
2374c5d
added bathyupdate option
thesser1 Jul 2, 2021
8aa84eb
Merge branch 'tjh/add_notebooks' of github.com:SBFRF/cmtb into tjh/ad…
thesser1 Jul 2, 2021
720470e
added flag to update bathy
thesser1 Jul 2, 2021
f173011
Merge pull request #32 from SBFRF/tjh/add_notebooks
SBFRF Jul 14, 2021
b8c15aa
updated testbed example input yml
SBFRF Aug 22, 2021
240f06d
Merge branch 'v2' of github.com:SBFRF/cmtb into v2
SBFRF Aug 22, 2021
ad4a6ed
moved funwave/swash slop to archive for now... make sure we're not lo…
SBFRF Aug 22, 2021
69729ef
mod example yml input, workflow
SBFRF Aug 22, 2021
e186465
WORKING SWASH for V2
SBFRF Aug 26, 2021
ac5532c
working swash runs with dumped plots to cmtb slack channel
SBFRF Aug 31, 2021
3bde76b
Merge pull request #35 from SBFRF/sb/v2_swash
thesser1 Sep 13, 2021
4f9b45d
updated minor changes to working on crunchy for swash
SBFRF Sep 14, 2021
29f7005
editing example yml
SBFRF Sep 14, 2021
1d7f275
fixed spelling error
SBFRF Sep 14, 2021
dbd88ec
updated conflict
SBFRF Sep 14, 2021
3a1ff20
updated swash variable yaml for nprocess data type
SBFRF Apr 27, 2022
d77b423
added data call to get integrated transect to pull specifically bathy…
SBFRF Apr 27, 2022
c988148
updated calls to appropriately force sever selection in generic and f…
SBFRF Apr 28, 2022
dedea54
Merge branch 'v2' of github.com:SBFRF/cmtb into v2
SBFRF Apr 28, 2022
4ac1535
fixing hard coded requirements/assumptions in yml, by setting defaults
SBFRF Apr 30, 2022
89984e2
made minor additions/updates to generic work flow to handle server ca…
SBFRF Apr 30, 2022
e5df7db
updated frontbacknew to define bathy input method as an option (histo…
SBFRF Apr 30, 2022
d7f8882
updating references to required submodules'
SBFRF Apr 30, 2022
8c186e5
updating frontbackNew to ensure only one spectra to prep_spec
SBFRF Sep 23, 2022
8c62e48
resolved issues with test name in swash setup
SBFRF Sep 23, 2022
b0f825d
updated yaml files
SBFRF Sep 23, 2022
b5c3f2a
final commits for making equal energy bining generate with swash
SBFRF Sep 23, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .cmtbSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
## This file is to hold system defaults so you don't have to include them in the input yaml
# the input yaml should overwrite these values as needed
#
####################################
#
runFlag: true
analyzeFlag: true
plotFlag: false
pbsFlag: false
generateFlag: true
namelistFlag: false
updateBathy: true
hpcSettings:
hpcCores: 36
hpcNodes: 1
testName: ''
logfileLoc: ./data/logs
workingDirectory: ./data # this is the directory where simulation files and QA/QC plots are made and existing architecture takes over
netCDFdir: ./thredds_data # this is the base directory where netCDF files are output
TDSdatabase: ./TDSlocationGrabber/database # location for TDS data base pickle (w/o extension)
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[*]
charset=utf-8
end_of_line=lf
insert_final_newline=false
indent_style=space
indent_size=4

[*.json]
indent_style=space
indent_size=2

[{*.yml,*.yaml}]
indent_style=space
indent_size=2

62 changes: 62 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Data and netCDF4 files
data/
ncFiles/

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

# =========================
# Operating System Files
# =========================

# OSX
# =========================

.DS_Store
.AppleDouble
.LSOverride

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

#pycharm fileS
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Python compile
*.pyc
.pyc
10 changes: 5 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "prepdata"]
path = prepdata
url = [email protected]:erdc/prepdata.git
[submodule "getdatatestbed"]
path = getdatatestbed
url = [email protected]:erdc/getdatatestbed.git
url = [email protected]:SBFRF/getdatatestbed.git
[submodule "testbedutils"]
path = testbedutils
url = [email protected]:erdc/testbedutils.git
url = [email protected]:SBFRF/testbedutils.git
[submodule "prepdata"]
path = prepdata
url = [email protected]:SBFRF/prepdata.git
2 changes: 2 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions .idea/cmtb.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/other.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 64 additions & 0 deletions ArchiveFolder/phaseResolved/FUNWAVES_play.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
from getdatatestbed import getDataFRF
import datetime as DT
from prepdata import prepDataLib as pdl
from testbedutils import sblib as sb
import numpy as np
## getting data for matt and gabby to write input files
pd = pdl.PrepDataTools() # initalize for WL processing

start = DT.datetime(2018, 10, 3, 17, 00)
start1 = DT.datetime(2018, 10, 5, 17, 00)
end = DT.datetime(2018, 10, 5, 18, 00)

go1 = getDataFRF.getObs(start, start1, THREDDS='CHL')
go2 = getDataFRF.getObs(start1, end, THREDDS='CHL')

WL1 = go1.getWL()
WL2 = go2.getWL()
WL1 = pd.prep_WL(WL1, [DT.datetime(2018, 10, 4, 17)])
WL2 = pd.prep_WL(WL2, [DT.datetime(2018, 10, 5, 17)])
import netCDF4 as nc
ncfile = nc.Dataset('https://chlthredds.erdc.dren.mil/thredds/dodsC/frf/geomorphology/elevationTransects/survey/FRF_20181004_1155_FRF_NAVD88_LARC_GPS_UTC_v20181012.nc')
bathy = {'elevation': ncfile['elevation'][:],
'time': nc.num2date(ncfile['time'][:], 'seconds since 1970-01-01'),
'xFRF': ncfile['xFRF'][:],
'yFRF': ncfile['yFRF'][:],}
# bathy1 = go1.getBathyTransectFromNC()
wave1 = go1.getWaveSpec('8m-array')
wave2 = go2.getWaveSpec('8m-array')

# now merge to one dictionary
def mergeDicts(dict1, dict2):

ds = [dict1, dict2]
d = {}
for k in dict1.keys():
d[k] = list(d[k] for d in ds)
return d
WL = mergeDicts(WL1, WL2)

idx1 = np.argwhere(wave1['time'] == DT.datetime(2018, 10, 4, 17)).squeeze()
idx2 = np.argwhere(wave2['time'] == DT.datetime(2018, 10, 5, 17)).squeeze()
wave1 = sb.reduceDict(wave1, idx1)
waves = mergeDicts(wave1, wave2)
import glob
fname = glob.glob('/home/spike/Downloads/*.nc')
toponcfile = nc.Dataset(fname[0])
topo1 = {'elevation': toponcfile['elevation'][:],
'xFRF': toponcfile['xFRF'][:],
'yFRF': toponcfile['yFRF'][:]}
toponcfile = nc.Dataset(fname[1])
topo2 = {'elevation': toponcfile['elevation'][:],
'xFRF': toponcfile['xFRF'][:],
'yFRF': toponcfile['yFRF'][:]}
topo = mergeDicts(topo1, topo2)
import pickle
fileOut = 'MattsFile.pickle'
with open(fileOut, 'wb') as fid:
pickle.dump((waves, WL, bathy, topo), fid, protocol=pickle.HIGHEST_PROTOCOL)

# to open

with open(fileOut, 'rb') as fid:
data = pickle.load(fid)

86 changes: 86 additions & 0 deletions ArchiveFolder/phaseResolved/funwavePlay.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
import matplotlib
# matplotlib.use('Agg')
from testbedutils import waveLib as wl
import numpy as np
import datetime as DT
from matplotlib import pyplot as plt
from prepdata import inputOutput
from plotting import operationalPlots as oP
import os, glob, multiprocessing
from testbedutils import sblib as sb
import pickle
###
nSubSample = 5
plotting = False
loadData = False # don't load in debug mode, takes forever!
path_prefix = '/home/spike/cmtb/data/FUNWAVE'
datestring = '20151005T000000Z'
figureBaseFname = 'CMTB_waveModels_FUNWAVE_'
bathyFile = '/home/spike/repos/cmtb/data/FUNWAVE/20151005T000000Z/depth.txt'
pickleFname = os.path.join(path_prefix, figureBaseFname + 'TS.pickle')
SeaSwellCutoff = 0.04
WL = 1.4
crossShoreTransectLine = 200
bandAvg = 3
########################################3
# funwave Timeseries analysis

fwio = inputOutput.funwaveIO(datestring, WL = WL)
if loadData == True:
flist = sorted(glob.glob(os.path.join(path_prefix, datestring,'output/sta*')))
simData = fwio.loadFunwaveTransect(flist)
simData['time'] = np.array([DT.datetime.strptime(datestring, '%Y%m%dT%H%M%SZ') + DT.timedelta(seconds=i) for i in simData['time']])
simData['elevation'] = -fwio.loadBathy(bathyFile)[crossShoreTransectLine,]
with open(pickleFname, 'wb') as fid:
pickle.dump(simData, fid, protocol=pickle.HIGHEST_PROTOCOL)
else:
with open(pickleFname, 'rb') as fid:
simData = pickle.load(fid)

if plotting == True:
## remove images before making them
imgList = glob.glob(os.path.join(path_prefix, datestring, 'figures', '*.png'))
[os.remove(ff) for ff in imgList]
############### write a parallel data load function ##################
dataOut=[]
def parallel_generateCrossShoreTimeSeries(tidx):
## generate a function that operates with only one input, can access local variable space
timeStep = simData['time'][tidx]
ofPlotName = os.path.join(path_prefix, datestring, 'figures', figureBaseFname + 'TS_' + timeStep.strftime('%Y%m%dT%H%M%S%fZ') +'.png')
oP.generate_CrossShoreTimeseries(ofPlotName, simData['eta'][tidx].squeeze(), -simData['elevation'], simData['xFRF'])
dataOut.append(ofPlotName)
######################################################################
tstart = DT.datetime.now()
pool=multiprocessing.Pool(4) # open multiprocessing pool
dataBack = pool.map(parallel_generateCrossShoreTimeSeries, range(0, len(simData['time']), nSubSample))
pool.close()
print('Took {} long to make all the plots in parallel {} processors'.format(DT.datetime.now() - tstart, 4))

# ## now make gif of waves moving across shore*
imgList = sorted(glob.glob(os.path.join(path_prefix, datestring, 'figures', figureBaseFname + '*TS_*.png')))
sb.makegif(imgList, os.path.join(path_prefix, datestring, 'figures', figureBaseFname + 'TS_{}.gif'.format(datestring)), dt=0.1)
print('Took {} long to make the movie and all the plots '.format(DT.datetime.now() - tstart))
# finish making images by taring files
tarOutFile = os.path.join(path_prefix, datestring, 'figures', figureBaseFname + 'TS.tar.gz')
sb.myTarMaker(tarOutFile, imgList)
print('Took {} long to make all the plots, movie and tarball '.format(DT.datetime.now() - tstart))

############### frequency analysis ##########################################################
fspec, freqs = wl.timeSeriesAnalysis1D(simData['time'].squeeze(),simData['eta'].squeeze(), bandAvg=bandAvg, windowLength=30)
total = wl.stats1D(fspec=fspec, frqbins=freqs, lowFreq=None, highFreq=None)
SeaSwellStats = wl.stats1D(fspec=fspec, frqbins=freqs, lowFreq=SeaSwellCutoff, highFreq=None)
IGstats = wl.stats1D(fspec=fspec, frqbins=freqs, lowFreq=None, highFreq=SeaSwellCutoff)
HsTS = 4 * np.std(simData['eta'].squeeze(), axis=0)
######################################################################################################
####################################### Plot functions ######################################################
#############################################################################################################
setup = np.mean(simData['eta'], axis=0).squeeze()
from plotting import operationalPlots as oP
ofname = os.path.join(path_prefix, datestring, 'figures', figureBaseFname + '_crossShoreSummary.png')
oP.plotCrossShoreSummaryTS(ofname, simData['xFRF'], simData['elevation'], total,
SeaSwellStats, IGstats, setup=setup, WL=WL)
ofname = os.path.join(path_prefix, datestring, 'figures', figureBaseFname + '_spectrograph.png')
oP.crossShoreSpectrograph(ofname, simData['xFRF'], freqs, fspec)
ofname = os.path.join(path_prefix, datestring, 'figures', figureBaseFname + '_surfaceTimeseries.png')
oP.crossShoreSurfaceTS2D(ofname, simData['eta'], simData['xFRF'], simData['time'])

Loading