diff --git a/B3D_Inputs/Alongshore_Test-parameters.yaml b/B3D_Inputs/Alongshore_Test-parameters.yaml index d604966..dd0f6eb 100644 --- a/B3D_Inputs/Alongshore_Test-parameters.yaml +++ b/B3D_Inputs/Alongshore_Test-parameters.yaml @@ -61,5 +61,5 @@ nn: 0.5 rmax: 0.95 rmin: 0.55 s_sf_eq: 0.01698590034494604 -storm_file: /Users/ceclmac/PycharmProjects/CASCADE/B3D_Inputs/Default_StormTimeSeries_1000yr.npy +storm_file: /Users/ceclmac/PycharmProjects/CASCADE/B3D_Inputs/cascade-default-storms.npy threshold_in: 0.25 diff --git a/B3D_Inputs/cascade-default-storms.npy b/B3D_Inputs/cascade-default-storms.npy new file mode 100644 index 0000000..fc2f6a6 Binary files /dev/null and b/B3D_Inputs/cascade-default-storms.npy differ diff --git a/cascade/bmft_coupler.py b/cascade/bmft_coupler.py index dacacfd..fb2ee4e 100644 --- a/cascade/bmft_coupler.py +++ b/cascade/bmft_coupler.py @@ -141,7 +141,6 @@ def updateMarsh(self, # =================================================================================================================================================================================================================================== # Advance PyBMFT-C back-barrier marshes # Update RSLR rate from Barrier3D - print(self._bmftc[iB3D]._RSLRi) self._bmftc[iB3D]._RSLRi = self._barrier3d[iB3D].RSLR[time_step] * 10 self._bmftc[iB3D]._RSLR = self._bmftc[iB3D].RSLRi * 10 ** (-3) / ( 3600 * 24 * 365) # Convert from mm/yr to m/s diff --git a/cascade/cascade.py b/cascade/cascade.py index 5f48237..c408d25 100644 --- a/cascade/cascade.py +++ b/cascade/cascade.py @@ -445,10 +445,6 @@ def __init__( name = self._filename ) - self._bmft_coupler.testInitalization(nt =self._nt,barrier3d=self._barrier3d,ny=self._ny, name = self._filename) - print("Barrier3d will be changed to reflect new initial geometry") - - @property def road_break(self): return self._road_break @@ -736,7 +732,6 @@ def update(self): self._bmft_coupler.updateMarsh(ny=self._ny,time_step=self._barrier3d[0].time_index,barrier3d=self._barrier3d) # Change barrier3d object to reflect new initalized changes self._barrier3d = self._bmft_coupler._barrier3d - print("Barrier3d will be changed to reflect new altered geometry") ############################################################################### # save data diff --git a/scripts/Batch_Run.py b/scripts/Batch_Run.py index d4bc9f4..1fd64fe 100644 --- a/scripts/Batch_Run.py +++ b/scripts/Batch_Run.py @@ -39,7 +39,7 @@ elevation_file = c_wd + "/B3D_Inputs/barrier3d-default-elevation.npy" dune_file = c_wd + "/B3D_Inputs/barrier3d-dunes.npy" -storm_file = c_wd+'/B3D_Inputs/Default_StormTimeSeries_1000yr.npy' +storm_file = c_wd+'/B3D_Inputs/cascade-default-storms.npy' # Call function @@ -115,7 +115,7 @@ def Batch_Runs( nt=nt_run, name=run_name, storm_file=storm_file, - alongshore_section_count=number_barrier3d_models, + alongshore_section_count=1, num_cores=3, rmin=rmin, rmax=rmax, diff --git a/scripts/Plot_Files.py b/scripts/Plot_Files.py index 9365efb..a6c538e 100644 --- a/scripts/Plot_Files.py +++ b/scripts/Plot_Files.py @@ -327,7 +327,7 @@ def plot_ElevAnimation_CASCADE( name_prefix = run_name nt_run = 19 -number_barrier3d_models = 1 +number_barrier3d_models = 2 # --------- plot --------- output = np.load(run_name + ".npz", allow_pickle=True)