Skip to content
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

Read in ak, bk coefficients #36

Merged
merged 70 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
f973613
initial changes to read in ak bk
Oct 5, 2023
1b55098
read ak/bk
Oct 17, 2023
d93a45d
add xfail
Oct 19, 2023
a6cc76e
remove input dir
Oct 19, 2023
59c8308
more fixes
Oct 26, 2023
aebcdba
further changes to unit tests
Oct 30, 2023
327bd10
finish up test
Nov 6, 2023
95c3bfd
add history
Nov 6, 2023
b6227d5
commit uncommited files
Nov 6, 2023
b571feb
lint
Nov 6, 2023
a2513d3
fix test comment
Nov 6, 2023
56e9293
Merge remote-tracking branch 'pace/main' into read_akbk
Nov 6, 2023
406497c
add input to top
Nov 6, 2023
362eb55
read in data
Dec 5, 2023
c0a5fc2
read in netcdf file in eta mod
Dec 12, 2023
6bde165
remove txt file
Dec 12, 2023
ed5846e
test
Dec 12, 2023
a6b8998
modify test and fix generate.py
Dec 12, 2023
4b22fc3
remove emacs backup file
Dec 12, 2023
eb8d88d
driver tests pass
Dec 12, 2023
63bdef3
fix helper.py
Dec 12, 2023
a2ff82d
fix fv3core tests
Dec 12, 2023
92dda5a
fix physics test
Dec 12, 2023
1d0bb25
fix grid tests
Dec 12, 2023
c7f0b07
nullcommconfig
Dec 12, 2023
07a55ae
cleanup input
Dec 12, 2023
10af092
last commit of the day, remove driver input. sorry for spamming
Dec 12, 2023
1314117
remove top level input
Dec 12, 2023
4c72d51
fix circular import problems
Dec 19, 2023
d650ed0
modify eta_file readin for test_restart_serial
Dec 19, 2023
a8a7df4
comment out 91 test
Dec 19, 2023
6624a92
rm safety checks
Jan 2, 2024
ba79aa1
revert diagnostics.py
Jan 23, 2024
c23aa18
restore driver.py
Jan 23, 2024
7a192fa
revert initialization.py
Jan 23, 2024
e740271
restore state.py
Jan 23, 2024
60c1805
restore analytic_init.py
Jan 23, 2024
b26acef
restore init_utils.py and analytic_init.py
Jan 23, 2024
38b9536
restore c_sw.py
Jan 23, 2024
b9f966a
d2a2c_vect.py
Jan 23, 2024
72010c5
restore fv3core/stensils
Jan 23, 2024
1abe716
restore translate_fvdynamics
Jan 23, 2024
af6d431
restore physics/stencils
Jan 23, 2024
13e1529
restore stencils
Jan 23, 2024
57d99f5
remove circular dependency
Jan 23, 2024
461802d
use pytest parametrize
Jan 23, 2024
16086a5
cleanup generation.py
Jan 23, 2024
2d920b7
yay fstrinngs
Jan 23, 2024
62dbdb9
add eta_file to MetricTerm init
Jan 23, 2024
0335342
remove eta_file argument in new_from_metric_terms and geos_wrapper
Jan 23, 2024
1f09546
use pytest parametrize for the xfail tests
Jan 23, 2024
d263bc2
use pytest parametrize for the xfail tests
Jan 23, 2024
cb57fbd
fix geos_wrapper and grid
Jan 23, 2024
b805d44
fix tests
Jan 23, 2024
6ff18fb
last commit!
Jan 23, 2024
d22719e
fstring is our friend
Jan 24, 2024
bf469e4
add test comments
Jan 24, 2024
85fefdc
fix util/HISTORY.md
Jan 24, 2024
f6084ba
fix comments
Jan 24, 2024
b5ca33e
remove __init__.py from tests/main/grid
Jan 24, 2024
bde31a4
add jupyter notebooks to generate eta files
Jan 25, 2024
0644ad3
generate ak,bk,ptop on metricterm init
Jan 26, 2024
42fda95
fix tests
Jan 26, 2024
c2f2acf
exploit np.all in eta mod
Jan 26, 2024
7780c8f
remove tests/main/grid/input
Jan 29, 2024
870bc87
update ci
Jan 29, 2024
2ff869a
test
Jan 29, 2024
4eb4fc2
remove input
Jan 29, 2024
a127680
edit ci yaml
Jan 29, 2024
f2bed7f
remove push
mlee03 Jan 29, 2024
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
80 changes: 80 additions & 0 deletions input/eta79.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
300 0
646.7159 0
1045.222 0
1469.188 0
1897.829 0
2325.385 0
2754.396 0
3191.294 0
3648.332 0
4135.675 0
4668.282 0
5247.94 0
5876.271 0
6554.716 0
7284.521 0
8066.738 0
8902.188 0
9791.482 0
10734.99 0
11626.25 0.001065947
12372.12 0.004128662
12990.41 0.009006631
13496.29 0.01554263
13902.77 0.02359921
14220.98 0.03305481
14460.58 0.0438012
14629.93 0.05574095
14736.33 0.06878554
14786.17 0.08285347
14785.11 0.09786981
14738.12 0.1137643
14649.66 0.130471
14523.7 0.1479275
14363.82 0.1660746
14173.24 0.1848558
13954.91 0.2042166
13711.48 0.2241053
13445.4 0.2444716
13158.9 0.2652672
12854.07 0.286445
12532.8 0.3079604
12196.85 0.3297701
11847.88 0.351832
11487.39 0.3741062
11116.82 0.3965532
10737.48 0.4191364
10350.62 0.4418194
9957.395 0.4645682
9558.875 0.48735
9156.069 0.5101338
8749.922 0.5328897
8341.315 0.5555894
7931.065 0.5782067
7519.942 0.6007158
7108.648 0.6230936
6698.281 0.6452944
6290.007 0.6672683
5884.984 0.6889648
5484.372 0.7103333
5089.319 0.7313231
4700.96 0.7518838
4320.421 0.7719651
3948.807 0.7915173
3587.201 0.8104913
3236.666 0.828839
2898.237 0.846513
2572.912 0.8634676
2261.667 0.8796583
1965.424 0.8950421
1685.079 0.9095779
1421.479 0.9232264
1175.419 0.9359506
947.6516 0.9477157
738.8688 0.9584892
549.713 0.9682413
380.7626 0.9769447
232.5417 0.9845753
105.481 0.9911126
-0.0008381903 0.9965372
0 1
92 changes: 92 additions & 0 deletions input/eta91.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
1.00000000 0.00000000
1.75000000 0.00000000
2.75000000 0.00000000
4.09999990 0.00000000
5.98951054 0.00000000
8.62932968 0.00000000
12.2572632 0.00000000
17.1510906 0.00000000
23.6545467 0.00000000
32.1627693 0.00000000
43.1310921 0.00000000
57.1100426 0.00000000
74.6595764 0.00000000
96.4470978 0.00000000
123.169769 0.00000000
155.601318 0.00000000
194.594009 0.00000000
241.047531 0.00000000
295.873840 0.00000000
360.046967 0.00000000
434.604828 0.00000000
520.628723 0.00000000
619.154846 0.00000000
731.296021 0.00000000
858.240906 0.00000000
1001.06561 0.00000000
1160.92859 0.00000000
1339.03992 0.00000000
1536.50012 0.00000000
1754.48938 0.00000000
1994.17834 0.00000000
2256.67407 0.00000000
2543.17139 0.00000000
2854.76392 0.00000000
3192.58569 0.00000000
3557.75366 0.00000000
3951.35107 0.00000000
4374.28662 0.00000000
4827.11084 0.00000000
5310.22168 0.00000000
5823.87793 0.00000000
6369.04248 0.00000000
6948.75244 0.00000000
7566.91992 3.50123992e-06
8226.34277 2.81484008e-05
8931.20996 9.38666999e-05
9684.46191 2.28561999e-04
10482.2725 5.12343016e-04
11318.2793 1.04712998e-03
12184.0771 1.95625005e-03
13065.5674 3.42317997e-03
13953.2207 5.58632007e-03
14830.7285 8.65428988e-03
15687.2617 1.27844000e-02
16508.0645 1.81719996e-02
17281.0996 2.49934997e-02
17994.2988 3.34198996e-02
18636.3223 4.36249003e-02
19196.1797 5.57769015e-02
19664.0723 7.00351968e-02
20030.1914 8.65636021e-02
20285.3691 0.105520003
20421.5254 0.127051994
20430.0684 0.151319996
20302.8730 0.178477004
20032.3711 0.208675995
19611.0664 0.242069006
19031.3848 0.278813988
18286.6426 0.319043010
17377.7930 0.362558991
16322.4639 0.408596009
15144.4033 0.456384987
13872.5674 0.505111992
12540.4785 0.553902984
11183.4170 0.601903021
9835.32715 0.648333013
8526.30664 0.692534983
7282.24512 0.733981013
6123.26074 0.772292018
5063.50684 0.807236016
4111.24902 0.838724971
3270.00122 0.866774976
2539.22729 0.891497016
1915.30762 0.913065016
1392.44995 0.931702971
963.134766 0.947658002
620.599365 0.961175978
357.989502 0.972495019
169.421387 0.981844008
51.0314941 0.989410996
2.48413086 0.995342016
0.00000000 1.00000000
80 changes: 80 additions & 0 deletions tests/main/driver/input/eta79.txt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In order to reduce the need for multiple versions of the same data, could the test refer to the file in input/?

Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
300 0
646.7159 0
1045.222 0
1469.188 0
1897.829 0
2325.385 0
2754.396 0
3191.294 0
3648.332 0
4135.675 0
4668.282 0
5247.94 0
5876.271 0
6554.716 0
7284.521 0
8066.738 0
8902.188 0
9791.482 0
10734.99 0
11626.25 0.001065947
12372.12 0.004128662
12990.41 0.009006631
13496.29 0.01554263
13902.77 0.02359921
14220.98 0.03305481
14460.58 0.0438012
14629.93 0.05574095
14736.33 0.06878554
14786.17 0.08285347
14785.11 0.09786981
14738.12 0.1137643
14649.66 0.130471
14523.7 0.1479275
14363.82 0.1660746
14173.24 0.1848558
13954.91 0.2042166
13711.48 0.2241053
13445.4 0.2444716
13158.9 0.2652672
12854.07 0.286445
12532.8 0.3079604
12196.85 0.3297701
11847.88 0.351832
11487.39 0.3741062
11116.82 0.3965532
10737.48 0.4191364
10350.62 0.4418194
9957.395 0.4645682
9558.875 0.48735
9156.069 0.5101338
8749.922 0.5328897
8341.315 0.5555894
7931.065 0.5782067
7519.942 0.6007158
7108.648 0.6230936
6698.281 0.6452944
6290.007 0.6672683
5884.984 0.6889648
5484.372 0.7103333
5089.319 0.7313231
4700.96 0.7518838
4320.421 0.7719651
3948.807 0.7915173
3587.201 0.8104913
3236.666 0.828839
2898.237 0.846513
2572.912 0.8634676
2261.667 0.8796583
1965.424 0.8950421
1685.079 0.9095779
1421.479 0.9232264
1175.419 0.9359506
947.6516 0.9477157
738.8688 0.9584892
549.713 0.9682413
380.7626 0.9769447
232.5417 0.9845753
105.481 0.9911126
-0.0008381903 0.9965372
0 1
92 changes: 92 additions & 0 deletions tests/main/driver/input/eta91.txt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as for tests/main/driver/input/eta79.txt

Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
1.00000000 0.00000000
1.75000000 0.00000000
2.75000000 0.00000000
4.09999990 0.00000000
5.98951054 0.00000000
8.62932968 0.00000000
12.2572632 0.00000000
17.1510906 0.00000000
23.6545467 0.00000000
32.1627693 0.00000000
43.1310921 0.00000000
57.1100426 0.00000000
74.6595764 0.00000000
96.4470978 0.00000000
123.169769 0.00000000
155.601318 0.00000000
194.594009 0.00000000
241.047531 0.00000000
295.873840 0.00000000
360.046967 0.00000000
434.604828 0.00000000
520.628723 0.00000000
619.154846 0.00000000
731.296021 0.00000000
858.240906 0.00000000
1001.06561 0.00000000
1160.92859 0.00000000
1339.03992 0.00000000
1536.50012 0.00000000
1754.48938 0.00000000
1994.17834 0.00000000
2256.67407 0.00000000
2543.17139 0.00000000
2854.76392 0.00000000
3192.58569 0.00000000
3557.75366 0.00000000
3951.35107 0.00000000
4374.28662 0.00000000
4827.11084 0.00000000
5310.22168 0.00000000
5823.87793 0.00000000
6369.04248 0.00000000
6948.75244 0.00000000
7566.91992 3.50123992e-06
8226.34277 2.81484008e-05
8931.20996 9.38666999e-05
9684.46191 2.28561999e-04
10482.2725 5.12343016e-04
11318.2793 1.04712998e-03
12184.0771 1.95625005e-03
13065.5674 3.42317997e-03
13953.2207 5.58632007e-03
14830.7285 8.65428988e-03
15687.2617 1.27844000e-02
16508.0645 1.81719996e-02
17281.0996 2.49934997e-02
17994.2988 3.34198996e-02
18636.3223 4.36249003e-02
19196.1797 5.57769015e-02
19664.0723 7.00351968e-02
20030.1914 8.65636021e-02
20285.3691 0.105520003
20421.5254 0.127051994
20430.0684 0.151319996
20302.8730 0.178477004
20032.3711 0.208675995
19611.0664 0.242069006
19031.3848 0.278813988
18286.6426 0.319043010
17377.7930 0.362558991
16322.4639 0.408596009
15144.4033 0.456384987
13872.5674 0.505111992
12540.4785 0.553902984
11183.4170 0.601903021
9835.32715 0.648333013
8526.30664 0.692534983
7282.24512 0.733981013
6123.26074 0.772292018
5063.50684 0.807236016
4111.24902 0.838724971
3270.00122 0.866774976
2539.22729 0.891497016
1915.30762 0.913065016
1392.44995 0.931702971
963.134766 0.947658002
620.599365 0.961175978
357.989502 0.972495019
169.421387 0.981844008
51.0314941 0.989410996
2.48413086 0.995342016
0.00000000 1.00000000
Loading