Skip to content

Commit

Permalink
Merge branch 'main' into feature/zhaobin74/cice4-as-shared-obj
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathomp4
mathomp4 authored May 23, 2023
2 parents 98c73b8 + 47f339f commit 22f1f69
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 94 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Change CICE4 build to shared library, in preparation for CICE6 integration

- Converted `pyrob` and `pyrob_CF` to Python 3. Requires MAPL 2.36.0 and ESMA_cmake v3.28.0 for f2py support

### Fixed

### Removed

## [1.9.0] - 2023-05-09

### Changed

- Updated 181 and 91L ak/bk to remove kinks in 1st derivative of DZ. Modified ak at top four levels of L137.
- Converted `pyrob` and `pyrob_CF` to Python 3. Requires MAPL 2.36.0 and ESMA_cmake v3.28.0 for f2py support

## [1.8.0] - 2023-03-10

### Changed
Expand Down
189 changes: 97 additions & 92 deletions GMAO_hermes/m_set_eta.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,8 +703,13 @@ subroutine set_eta_r8_(km, ks, ptop, pint, ak, bk)

! ECMWF 137-Levels
! --------------
! 30-Apr-2023 old top4 levels with kink
!ak(1) = 1.000000
!ak(2) = 2.000365
!ak(3) = 3.102241
!ak(4) = 4.666084
data a137 &
/1.000000, 2.000365, 3.102241, 4.666084, 6.827977, 9.746966, 13.605424, 18.608931, 24.985718, 32.985710, &
/1.000000, 1.825000, 3.000000, 4.630000, 6.827977, 9.746966, 13.605424, 18.608931, 24.985718, 32.985710, &
42.879242, 54.955463, 69.520576, 86.895882, 107.415741, 131.425507, 159.279404, 191.338562, 227.968948, 269.539581, &
316.420746, 368.982361, 427.592499, 492.616028, 564.413452, 643.339905, 729.744141, 823.967834, 926.344910, 1037.20117, &
1156.853638, 1285.610352, 1423.770142, 1571.622925, 1729.448975, 1897.519287, 2076.095947, 2265.431641, 2465.770508, 2677.348145, &
Expand Down Expand Up @@ -766,81 +771,81 @@ subroutine set_eta_r8_(km, ks, ptop, pint, ak, bk)
0.778173, 0.818387, 0.853709, 0.884270, 0.910347, &
0.932311, 0.950579, 0.965569, 0.977672, 0.987236, &
0.994526, 1.00000 /
data a91 /1.0000000, 1.7500000, 2.7500000, 4.1000000, 5.9895105, &
8.6293297, 12.257263, 17.151091, 23.654547, 32.162769, &
43.131092, 57.110043, 74.659576, 96.447098, 123.16977, &
155.60132, 194.59401, 241.04753, 295.87384, 360.04697, &
434.60483, 520.62872, 619.15485, 731.29602, 858.24091, &
1001.0656, 1160.9286, 1339.0399, 1536.5001, 1754.4894, &
1994.1783, 2256.6741, 2543.1714, 2854.7639, 3192.5857, &
3557.7537, 3951.3511, 4374.2866, 4827.1108, 5310.2217, &
5823.8779, 6369.0425, 6948.7524, 7566.9199, 8226.3428, &
8931.2100, 9684.4619, 10482.272, 11318.279, 12184.077, &
13065.567, 13953.221, 14830.729, 15687.262, 16508.064, &
17281.100, 17994.299, 18636.322, 19196.180, 19664.072, &
20030.191, 20285.369, 20421.525, 20430.068, 20302.873, &
20032.371, 19611.066, 19031.385, 18286.643, 17377.793, &
16322.464, 15144.403, 13872.567, 12540.479, 11183.417, &
9835.3271, 8526.3066, 7282.2451, 6123.2607, 5063.5068, &
4111.2490, 3270.0012, 2539.2273, 1915.3076, 1392.4500, &
963.13477, 620.59937, 357.98950, 169.42139, 51.031494, &
2.4841309, 0.0000000 /
data a91 /1.0000000, 2.7320021, 5.0626256, 8.5371946, 13.689281, &
21.104062, 31.473483, 45.574075, 64.276727, 88.524549, &
119.33909, 157.79703, 205.02323, 262.17985, 330.44498, &
411.01644, 505.08095, 613.82998, 738.42588, 880.02165, &
1039.7289, 1218.6382, 1417.7971, 1638.2225, 1880.8874, &
2146.7288, 2436.6440, 2751.4933, 3092.1009, 3459.2416, &
3853.5944, 4275.6681, 4725.7480, 5203.9468, 5710.5322, &
6246.3765, 6813.2257, 7413.5233, 8050.0894, 8725.3293, &
9440.2132, 10193.079, 10979.200, 11791.246, 12619.936, &
13454.955, 14285.393, 15100.307, 15888.956, 16641.027, &
17346.838, 17997.313, 18584.084, 19099.351, 19535.951, &
19887.249, 20147.142, 20309.935, 20370.286, 20323.132, &
20163.705, 19887.441, 19490.053, 18967.926, 18319.846, &
17549.136, 16665.161, 15682.747, 14620.709, 13500.284, &
12344.102, 11174.850, 10014.280, 8881.9194, 7794.7104, &
6766.2437, 5806.9154, 4923.7325, 4120.8109, 3399.6358, &
2759.5947, 2198.3948, 1712.5407, 1297.7356, 949.34082, &
662.69124, 433.48389, 258.06681, 133.71175, 56.315104, &
17.191569, 0.0000000 /
data b91 /0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 3.50124e-06, 2.81484e-05, &
9.38667e-05, 0.000228562, 0.000512343, 0.00104713, 0.00195625, &
0.00342318, 0.00558632, 0.00865429, 0.0127844, 0.0181720, &
0.0249935, 0.0334199, 0.0436249, 0.0557769, 0.0700352, &
0.0865636, 0.105520, 0.127052, 0.151320, 0.178477, &
0.208676, 0.242069, 0.278814, 0.319043, 0.362559, &
0.408596, 0.456385, 0.505112, 0.553903, 0.601903, &
0.648333, 0.692535, 0.733981, 0.772292, 0.807236, &
0.838725, 0.866775, 0.891497, 0.913065, 0.931703, &
0.947658, 0.961176, 0.972495, 0.981844, 0.989411, &
0.995342, 1.00000 /
data a181 /1.0000000, 1.325725, 1.7250000, 2.2000000, 2.7500000, &
3.3860855, 4.1233277, 4.9958706, 6.0387363, 7.2610245, &
8.7148447, 10.408404, 12.397021, 14.698566, 17.369101, &
20.446402, 23.983353, 28.038151, 32.642284, 37.900143, &
43.822773, 50.539959, 58.071102, 66.521347, 75.967796, &
86.479813, 98.193451, 111.13642, 125.46181, 141.23837, &
158.56229, 177.59976, 198.39230, 221.10054, 245.82892, &
272.67422, 301.81915, 333.33337, 367.35645, 404.06665, &
443.53485, 485.93210, 531.39905, 580.03564, 632.03076, &
687.51086, 746.59155, 809.46063, 876.24243, 947.05927, &
1022.1003, 1101.4973, 1185.3728, 1273.9043, 1367.2411, &
1465.4983, 1568.8376, 1677.4410, 1791.4093, 1910.8951, &
2036.0768, 2167.0686, 2304.0112, 2447.0752, 2596.4036, &
2752.1150, 2914.3584, 3083.3037, 3259.0642, 3441.7800, &
3631.6067, 3828.6858, 4033.1138, 4245.0000, 4464.4087, &
4691.3931, 4926.0132, 5168.3125, 5418.3120, 5676.0361, &
5941.5762, 6215.1167, 6497.1655, 6788.2124, 7088.6963, &
7399.0981, 7719.6548, 8050.9492, 8393.3418, 8747.4395, &
9114.0293, 9492.8174, 9883.1836, 10284.514, 10696.003, &
11116.694, 11545.480, 11981.056, 12421.522, 12864.947, &
13310.971, 13757.272, 14201.801, 14642.882, 15079.733, &
15510.191, 15931.703, 16343.536, 16744.199, 17131.818, &
17504.734, 17861.605, 18201.016, 18521.611, 18821.934, &
19100.689, 19356.793, 19588.516, 19794.955, 19975.031, &
20127.486, 20251.057, 20345.215, 20408.137, 20439.193, &
20437.375, 20401.547, 20330.734, 20224.135, 20080.361, &
19898.953, 19678.531, 19418.391, 19117.633, 18775.178, &
18390.545, 17963.656, 17496.461, 16991.633, 16451.850, &
15880.094, 15279.755, 14654.828, 14009.356, 13347.754, &
12674.469, 11994.299, 11311.212, 10629.535, 9953.3809, &
9286.5479, 8632.5986, 7994.6167, 7375.5801, 6777.6978, &
6203.3325, 5653.7783, 5130.5054, 4634.3564, 4165.9609, &
3725.7202, 3313.5742, 2929.5410, 2573.0042, 2243.6401, &
1940.7349, 1663.2080, 1410.8154, 1181.8054, 975.88501, &
791.96167, 628.96118, 486.34033, 362.99438, 258.23364, &
171.97876, 102.78320, 51.965332, 18.139648, 2.5878906, &
0.0000000, 0.0000000 /
0.00000, 2.62948e-07, 6.15473e-06, 2.87722e-05, 8.48806e-05, &
0.000205177, 0.000443909, 0.000880080, 0.00162041, 0.00278605, &
0.00451503, 0.00694698, 0.0102248, 0.0144896, 0.0198788, &
0.0265244, 0.0345531, 0.0440860, 0.0552385, 0.0681222, &
0.0828427, 0.0995024, 0.118199, 0.139029, 0.162086, &
0.187464, 0.215251, 0.245538, 0.278409, 0.313879, &
0.351764, 0.391668, 0.433051, 0.475347, 0.517981, &
0.560381, 0.601993, 0.642327, 0.680949, 0.717523, &
0.751785, 0.783566, 0.812772, 0.839382, 0.863431, &
0.885004, 0.904216, 0.921213, 0.936148, 0.949187, &
0.960488, 0.970209, 0.978489, 0.985455, 0.991215, &
0.995929, 1.00000 /
data a181 /1.0000000, 1.6461494, 2.3988098, 3.3373925, 4.5180100, &
5.9846950, 7.7937295, 10.010172, 12.710444, 15.973860, &
19.886346, 24.538486, 30.024769, 36.447639, 43.915803, &
52.545737, 62.453836, 73.764708, 86.607943, 101.11680, &
117.42552, 135.67413, 156.00783, 178.57081, 203.51057, &
230.97658, 261.12225, 294.09498, 330.04762, 369.13346, &
411.50830, 457.32002, 506.71984, 559.85860, 616.88715, &
677.95229, 743.20095, 812.77976, 886.82963, 965.49068, &
1048.9029, 1137.2056, 1230.5308, 1329.0094, 1432.7708, &
1541.9456, 1656.6555, 1777.0232, 1903.1678, 2035.2088, &
2173.2571, 2317.4255, 2467.8252, 2624.5658, 2787.7489, &
2957.4768, 3133.8507, 3316.9714, 3506.9325, 3703.8235, &
3907.7214, 4118.6851, 4336.7484, 4561.9281, 4794.2279, &
5033.6431, 5280.1592, 5533.7681, 5794.5055, 6062.4980, &
6337.9868, 6621.3268, 6912.9118, 7213.1229, 7522.2804, &
7840.7098, 8168.7861, 8506.9408, 8855.5426, 9214.7142, &
9584.2399, 9963.5983, 10352.111, 10748.987, 11153.318, &
11564.007, 11979.737, 12399.133, 12820.830, 13243.570, &
13665.922, 14086.428, 14503.591, 14916.111, 15322.602, &
15721.715, 16112.059, 16492.407, 16861.516, 17218.218, &
17561.331, 17889.768, 18202.451, 18498.379, 18776.566, &
19036.070, 19275.971, 19495.400, 19693.530, 19869.553, &
20022.686, 20152.202, 20257.406, 20337.620, 20392.130, &
20420.286, 20421.458, 20395.044, 20340.425, 20257.007, &
20144.234, 20001.538, 19828.378, 19624.186, 19388.455, &
19120.682, 18820.454, 18487.599, 18122.389, 17725.721, &
17299.086, 16844.410, 16363.835, 15859.595, 15334.131, &
14790.135, 14230.490, 13658.113, 13075.906, 12486.888, &
11894.071, 11300.423, 10708.651, 10121.401, 9541.1803, &
8970.3675, 8411.0514, 7865.0798, 7334.1450, 6819.7266, &
6323.0938, 5845.2210, 5386.9040, 4948.7590, 4531.2215, &
4134.5581, 3758.8643, 3404.0995, 3070.1029, 2756.5979, &
2463.2467, 2189.6016, 1935.1705, 1699.3937, 1481.6793, &
1281.4331, 1098.0062, 930.81258, 779.20329, 642.64526, &
520.55054, 412.42879, 317.77547, 236.18368, 167.34212, &
111.00464, 67.106120, 35.426839, 15.342204, 4.8543294, &
0.89721680, 0.0000000 /
data b181 /0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
Expand All @@ -855,29 +860,29 @@ subroutine set_eta_r8_(km, ks, ptop, pint, ak, bk)
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
0.00000, 0.00000, 0.00000, 0.00000, 0.00000, &
9.04550e-07, 6.80873e-06, 1.88624e-05, 4.01559e-05, 7.30653e-05, &
0.000117618, 0.000184636, 0.000283122, 0.000424446, 0.000622510, &
0.000890024, 0.00124501, 0.00170468, 0.00229318, 0.00303516, &
0.00394072, 0.00503879, 0.00635444, 0.00791055, 0.00972184, &
0.0118162, 0.0142258, 0.0169629, 0.0200500, 0.0235133, &
0.0273754, 0.0316569, 0.0363798, 0.0415651, 0.0472346, &
0.0534086, 0.0601060, 0.0673534, 0.0751669, 0.0835657, &
0.0925711, 0.102204, 0.112478, 0.123421, 0.135049, &
0.147381, 0.160437, 0.174237, 0.188798, 0.204144, &
0.220291, 0.237262, 0.255072, 0.273744, 0.293296, &
0.313739, 0.335044, 0.357121, 0.379850, 0.403144, &
0.426909, 0.451043, 0.475437, 0.499982, 0.524566, &
0.549077, 0.573402, 0.597446, 0.621112, 0.644309, &
0.666953, 0.688972, 0.710301, 0.730885, 0.750681, &
0.769650, 0.787772, 0.805026, 0.821406, 0.836910, &
0.851542, 0.865314, 0.878240, 0.890344, 0.901645, &
0.912175, 0.921963, 0.931035, 0.939429, 0.947170, &
0.954294, 0.960833, 0.966813, 0.972267, 0.977224, &
0.981703, 0.985739, 0.989336, 0.992526, 0.995314, &
0.997766, 1.00000 /
0.00000, 0.00000, 0.00000, 8.66281e-07, 4.30872e-06, &
1.23622e-05, 2.78373e-05, 5.24551e-05, 8.85466e-05, 0.000139698, &
0.000213463, 0.000319596, 0.000468744, 0.000671591, 0.000940946, &
0.00129107, 0.00173889, 0.00230345, 0.00300141, 0.00384951, &
0.00486404, 0.00606625, 0.00747397, 0.00910526, 0.0109764, &
0.0131071, 0.0155140, 0.0182150, 0.0212261, 0.0245646, &
0.0282452, 0.0322847, 0.0366982, 0.0415011, 0.0467072, &
0.0523312, 0.0583875, 0.0648898, 0.0718511, 0.0792848, &
0.0872044, 0.0956224, 0.104550, 0.114000, 0.123985, &
0.134518, 0.145609, 0.157270, 0.169514, 0.182353, &
0.195797, 0.209857, 0.224545, 0.239873, 0.255851, &
0.272491, 0.289803, 0.307785, 0.326419, 0.345659, &
0.365435, 0.385673, 0.406299, 0.427248, 0.448454, &
0.469840, 0.491328, 0.512844, 0.534317, 0.555677, &
0.576847, 0.597762, 0.618360, 0.638587, 0.658385, &
0.677706, 0.696509, 0.714758, 0.732423, 0.749476, &
0.765898, 0.781674, 0.796796, 0.811257, 0.825057, &
0.838199, 0.850689, 0.862535, 0.873752, 0.884352, &
0.894353, 0.903769, 0.912623, 0.920933, 0.928720, &
0.936005, 0.942807, 0.949150, 0.955052, 0.960536, &
0.965618, 0.970318, 0.974655, 0.978647, 0.982307, &
0.985649, 0.988688, 0.991432, 0.993898, 0.996109, &
0.998114, 1.00000 /

! GFS 127-levels
data a127 /1.0000000, 1.6100000, 2.5300000, 3.9200001, 5.9800000, &
Expand Down

0 comments on commit 22f1f69

Please sign in to comment.