-
Notifications
You must be signed in to change notification settings - Fork 0
Add remaining Genslip parameters to SRFConfig #93
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: pegasus
Are you sure you want to change the base?
Changes from 5 commits
3dcde70
c6744a3
6834147
5968e3e
3a99d04
beee5ef
5401095
017d3b2
f0cfeeb
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -135,6 +135,94 @@ def test_srf_config_example(tmp_path: Path) -> None: | |||||
| xmag_exp=None, | ||||||
| kx_corner=None, | ||||||
| ky_corner=None, | ||||||
| beta_asp=0.3, | ||||||
| beta_deep=0.13, | ||||||
| beta_mid=0.13, | ||||||
| beta_mid_depth=6.5, | ||||||
| beta_mid_depth_range=1.5, | ||||||
| beta_shal=0.5, | ||||||
| beta_shal_depth=2.0, | ||||||
| beta_shal_depth_range=1.0, | ||||||
| beta_subevt=0.1, | ||||||
| deep_risetimedep=17.5, | ||||||
| deep_risetimedep_range=2.5, | ||||||
| deep_risetimefac=2.0, | ||||||
| risetimedep=6.5, | ||||||
| risetimedep_range=1.5, | ||||||
| risetimefac=2.0, | ||||||
| rt_rand=0.0, | ||||||
| rt_scalefac=1.0, | ||||||
| stype=None, | ||||||
| hyb_corlen_deep_wt_end=1.0, | ||||||
| hyb_corlen_deep_wt_start=0.0, | ||||||
| hyb_corlen_dep=6.5, | ||||||
| hyb_corlen_dep_range=1.5, | ||||||
| hyb_corlen_fac=2.0, | ||||||
| hyb_corlen_flag=False, | ||||||
| hyb_corlen_kmodel=schemas.KModel.SUZUKI, | ||||||
| hyb_corlen_shal_wt_end=0.0, | ||||||
| hyb_corlen_shal_wt_start=1.0, | ||||||
| hyb_corlen_side_taper=0.08, | ||||||
| fdrup_scale_slip=False, | ||||||
| fdrup_time=False, | ||||||
| rupture_delay=0.0, | ||||||
| rvfmax=1.414, | ||||||
| rvfmin=0.25, | ||||||
| rvfrac_slip_sig=None, | ||||||
| truncate_zero_slip=True, | ||||||
| slip_water_level=None, | ||||||
| rake_sigma=15.0, | ||||||
| fractal_rake=False, | ||||||
| tsfac1_scor=0.8, | ||||||
| tsfac1_sigma=1.0, | ||||||
| tsfac2_lambda_max=5.0, | ||||||
| tsfac2_lambda_min=None, | ||||||
| tsfac2_scor=0.5, | ||||||
| tsfac2_sigma=1.0, | ||||||
| tsfac_bzero=-0.1, | ||||||
| tsfac_coef=1.1, | ||||||
| tsfac_main=None, | ||||||
| tsfac_slope=-0.5, | ||||||
| circular_average=False, | ||||||
| kmodel=schemas.KModel.MAI, | ||||||
| kord=4, | ||||||
| magC=6.3, | ||||||
| mag_area_Acoef=None, | ||||||
| mag_area_Bcoef=None, | ||||||
| mai_wt=0.5, | ||||||
| modified_corners=False, | ||||||
| somerville_wt=0.5, | ||||||
| stretch_kcorner=False, | ||||||
| use_gaus=True, | ||||||
| use_median_mag=False, | ||||||
| lambda_max=None, | ||||||
| lambda_min=None, | ||||||
| wavelength_max=None, | ||||||
| wavelength_min=None, | ||||||
| asp_taper_fac=0.05, | ||||||
| extend_fac=None, | ||||||
| flen_max=None, | ||||||
| fwid_max=None, | ||||||
| moment_fraction=None, | ||||||
| perturb_subfault_location=True, | ||||||
| rand_rake_degs=60.0, | ||||||
| rtime1_depth=2.0, | ||||||
| rtime1_depth_range=1.0, | ||||||
| rtime1_scor=0.8, | ||||||
| rtime1_sigma=0.85, | ||||||
| rtime2_scor=0.5, | ||||||
| rtime2slip_exp=0.5, | ||||||
| rtime_rand=None, | ||||||
| set_rake=None, | ||||||
| svr_wt=0.0, | ||||||
| target_savg=None, | ||||||
| use_Mw=True, | ||||||
| aseis_flag=False, | ||||||
| aseis_smooth=False, | ||||||
| aseis_dep=10.0, | ||||||
| aseis_fac=None, | ||||||
| xshift=0.0, | ||||||
| yshift=0.0, | ||||||
| ) | ||||||
|
|
||||||
| realisation_ffp = tmp_path / "realisation.json" | ||||||
|
|
@@ -174,6 +262,97 @@ def test_srf_config_example(tmp_path: Path) -> None: | |||||
| "xmag_exp": None, | ||||||
| "kx_corner": None, | ||||||
| "ky_corner": None, | ||||||
| "beta_asp": 0.3, | ||||||
| "beta_deep": 0.13, | ||||||
| "beta_mid": 0.13, | ||||||
| "beta_mid_depth": 6.5, | ||||||
| "beta_mid_depth_range": 1.5, | ||||||
| "beta_shal": 0.5, | ||||||
| "beta_shal_depth": 2.0, | ||||||
| "beta_shal_depth_range": 1.0, | ||||||
| "beta_subevt": 0.1, | ||||||
| "deep_risetimedep": 17.5, | ||||||
| "deep_risetimedep_range": 2.5, | ||||||
| "deep_risetimefac": 2.0, | ||||||
| "risetimedep": 6.5, | ||||||
| "risetimedep_range": 1.5, | ||||||
| "risetimefac": 2.0, | ||||||
| "rt_rand": 0.0, | ||||||
| "rt_scalefac": 1.0, | ||||||
| "stype": None, | ||||||
| "hyb_corlen_deep_wt_end": 1.0, | ||||||
| "hyb_corlen_deep_wt_start": 0.0, | ||||||
| "hyb_corlen_dep": 6.5, | ||||||
| "hyb_corlen_dep_range": 1.5, | ||||||
| "hyb_corlen_fac": 2.0, | ||||||
| "hyb_corlen_flag": False, | ||||||
| "hyb_corlen_kmodel": schemas.KModel.SUZUKI, | ||||||
| "hyb_corlen_shal_wt_end": 0.0, | ||||||
| "hyb_corlen_shal_wt_start": 1.0, | ||||||
| "hyb_corlen_side_taper": 0.08, | ||||||
| "fdrup_scale_slip": False, | ||||||
| "fdrup_time": False, | ||||||
| "rupture_delay": 0.0, | ||||||
| "rvfmax": 1.414, | ||||||
| "rvfmin": 0.25, | ||||||
| "rvfrac_slip_sig": None, | ||||||
| "truncate_zero_slip": True, | ||||||
| "slip_water_level": None, | ||||||
| "rake_sigma": 15.0, | ||||||
| "fractal_rake": False, | ||||||
| "tsfac1_scor": 0.8, | ||||||
| "tsfac1_sigma": 1.0, | ||||||
| "tsfac2_lambda_max": 5.0, | ||||||
| "tsfac2_lambda_min": None, | ||||||
| "tsfac2_scor": 0.5, | ||||||
| "tsfac2_sigma": 1.0, | ||||||
| "tsfac_bzero": -0.1, | ||||||
| "tsfac_coef": 1.1, | ||||||
| "tsfac_main": None, | ||||||
| "tsfac_slope": -0.5, | ||||||
| "circular_average": False, | ||||||
| "kmodel": 2.0, | ||||||
| "kord": 4.0, | ||||||
|
||||||
| "kord": 4.0, | |
| "kord": 4, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in commit 5401095 - "kmodel": 2 (int, from IntEnum serialization).
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,94 @@ def test_build_genslip_command_static_args() -> None: | |
| xmag_exp=1.0, | ||
| kx_corner=None, | ||
| ky_corner=None, | ||
| beta_asp=0.3, | ||
| beta_deep=0.13, | ||
| beta_mid=0.13, | ||
| beta_mid_depth=6.5, | ||
| beta_mid_depth_range=1.5, | ||
| beta_shal=0.5, | ||
| beta_shal_depth=2.0, | ||
| beta_shal_depth_range=1.0, | ||
| beta_subevt=0.1, | ||
| deep_risetimedep=17.5, | ||
| deep_risetimedep_range=2.5, | ||
| deep_risetimefac=2.0, | ||
| risetimedep=6.5, | ||
| risetimedep_range=1.5, | ||
| risetimefac=2.0, | ||
| rt_rand=0.0, | ||
| rt_scalefac=1.0, | ||
| stype=None, | ||
| hyb_corlen_deep_wt_end=1.0, | ||
| hyb_corlen_deep_wt_start=0.0, | ||
| hyb_corlen_dep=6.5, | ||
| hyb_corlen_dep_range=1.5, | ||
| hyb_corlen_fac=2.0, | ||
| hyb_corlen_flag=False, | ||
| hyb_corlen_kmodel=schemas.KModel.SUZUKI, | ||
| hyb_corlen_shal_wt_end=0.0, | ||
| hyb_corlen_shal_wt_start=1.0, | ||
| hyb_corlen_side_taper=0.08, | ||
| fdrup_scale_slip=False, | ||
| fdrup_time=False, | ||
| rupture_delay=0.0, | ||
| rvfmax=1.414, | ||
| rvfmin=0.25, | ||
| rvfrac_slip_sig=None, | ||
| truncate_zero_slip=True, | ||
| slip_water_level=None, | ||
| rake_sigma=15.0, | ||
| fractal_rake=False, | ||
| tsfac1_scor=0.8, | ||
| tsfac1_sigma=1.0, | ||
| tsfac2_lambda_max=5.0, | ||
| tsfac2_lambda_min=None, | ||
| tsfac2_scor=0.5, | ||
| tsfac2_sigma=1.0, | ||
| tsfac_bzero=-0.1, | ||
| tsfac_coef=1.1, | ||
| tsfac_main=None, | ||
| tsfac_slope=-0.5, | ||
| circular_average=False, | ||
| kmodel=schemas.KModel.MAI, | ||
| kord=4, | ||
| magC=6.3, | ||
| mag_area_Acoef=None, | ||
| mag_area_Bcoef=None, | ||
| mai_wt=0.5, | ||
| modified_corners=False, | ||
| somerville_wt=0.5, | ||
| stretch_kcorner=False, | ||
| use_gaus=True, | ||
| use_median_mag=False, | ||
| lambda_max=None, | ||
| lambda_min=None, | ||
| wavelength_max=None, | ||
| wavelength_min=None, | ||
| asp_taper_fac=0.05, | ||
| extend_fac=None, | ||
| flen_max=None, | ||
| fwid_max=None, | ||
| moment_fraction=None, | ||
| perturb_subfault_location=True, | ||
| rand_rake_degs=60.0, | ||
| rtime1_depth=2.0, | ||
| rtime1_depth_range=1.0, | ||
| rtime1_scor=0.8, | ||
| rtime1_sigma=0.85, | ||
| rtime2_scor=0.5, | ||
| rtime2slip_exp=0.5, | ||
| rtime_rand=None, | ||
| set_rake=None, | ||
| svr_wt=0.0, | ||
| target_savg=None, | ||
| use_Mw=True, | ||
| aseis_flag=False, | ||
| aseis_smooth=False, | ||
| aseis_dep=10.0, | ||
| aseis_fac=None, | ||
| xshift=0.0, | ||
| yshift=0.0, | ||
| ) | ||
| genslip_path = Path("genslip_v5.6.2") | ||
| gsf_path = Path("/tmp/fault.gsf") | ||
|
|
@@ -94,4 +182,75 @@ def test_build_genslip_command_static_args() -> None: | |
| "deep_vrup=0.7", | ||
| "deep_vrup_dep=20.0", | ||
| "deep_vrup_deprange=2.5", | ||
| # New genslip parameters | ||
| "beta_asp=0.3", | ||
| "beta_deep=0.13", | ||
| "beta_mid=0.13", | ||
| "beta_mid_depth=6.5", | ||
| "beta_mid_depth_range=1.5", | ||
| "beta_shal=0.5", | ||
| "beta_shal_depth=2.0", | ||
| "beta_shal_depth_range=1.0", | ||
| "beta_subevt=0.1", | ||
| "deep_risetimedep=17.5", | ||
| "deep_risetimedep_range=2.5", | ||
| "deep_risetimefac=2.0", | ||
| "risetimedep=6.5", | ||
| "risetimedep_range=1.5", | ||
| "risetimefac=2.0", | ||
| "rt_rand=0.0", | ||
| "rt_scalefac=1.0", | ||
| "hyb_corlen_deep_wt_end=1.0", | ||
| "hyb_corlen_deep_wt_start=0.0", | ||
| "hyb_corlen_dep=6.5", | ||
| "hyb_corlen_dep_range=1.5", | ||
| "hyb_corlen_fac=2.0", | ||
| "hyb_corlen_flag=0", | ||
| "hyb_corlen_kmodel=schemas.KModel.SUZUKI", | ||
|
||
| "hyb_corlen_shal_wt_end=0.0", | ||
| "hyb_corlen_shal_wt_start=1.0", | ||
| "hyb_corlen_side_taper=0.08", | ||
| "fdrup_scale_slip=0", | ||
| "fdrup_time=0", | ||
| "rupture_delay=0.0", | ||
| "rvfmax=1.414", | ||
| "rvfmin=0.25", | ||
| "truncate_zero_slip=1", | ||
| "rake_sigma=15.0", | ||
| "fractal_rake=0", | ||
| "tsfac1_scor=0.8", | ||
| "tsfac1_sigma=1.0", | ||
| "tsfac2_lambda_max=5.0", | ||
| "tsfac2_scor=0.5", | ||
| "tsfac2_sigma=1.0", | ||
| "tsfac_bzero=-0.1", | ||
| "tsfac_coef=1.1", | ||
| "tsfac_slope=-0.5", | ||
| "circular_average=0", | ||
| "kmodel=schemas.KModel.MAI", | ||
| "kord=4", | ||
| "magC=6.3", | ||
| "mai_wt=0.5", | ||
| "modified_corners=0", | ||
| "somerville_wt=0.5", | ||
| "stretch_kcorner=0", | ||
| "use_gaus=1", | ||
| "use_median_mag=0", | ||
| "asp_taper_fac=0.05", | ||
| "perturb_subfault_location=1", | ||
| "rand_rake_degs=60.0", | ||
| "read_slip_file=0", | ||
| "rtime1_depth=2.0", | ||
| "rtime1_depth_range=1.0", | ||
| "rtime1_scor=0.8", | ||
| "rtime1_sigma=0.85", | ||
| "rtime2_scor=0.5", | ||
| "rtime2slip_exp=0.5", | ||
| "svr_wt=0.0", | ||
| "use_Mw=1", | ||
| "aseis_flag=0", | ||
| "aseis_smooth=0", | ||
| "aseis_dep=10.0", | ||
| "xshift=0.0", | ||
| "yshift=0.0", | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.