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

Bugfix/wdboggs/i3248 test max action #3275

Closed
wants to merge 2,601 commits into from
Closed
Changes from 16 commits
Commits
Show all changes
2601 commits
Select commit Hold shift + click to select a range
0358e2d
Change '_FUNCN' to '_FUNC' which is the correct macro appearing in files
darianboggs Nov 4, 2024
01d41fc
Update CHANGELOG.md
darianboggs Nov 4, 2024
57462ce
Merge pull request #3150 from GEOS-ESM/feature/wdboggs/3027_TimeAccum…
tclune Nov 4, 2024
8305c33
Merge pull request #3151 from GEOS-ESM/bugfix/wdboggs/undo_function_o…
tclune Nov 4, 2024
2f75e0d
New tests
darianboggs Nov 4, 2024
94ff0ef
Fixed VerticalRegridActions
pchakraborty Nov 4, 2024
cb49bb0
Use MAPL_FieldCreate to create field with FixedLevels vertical grid c…
pchakraborty Nov 4, 2024
4af3984
Fixed the scenarios tests vertical_regridding and vertical_regridding_2
pchakraborty Nov 4, 2024
526a318
Merge remote-tracking branch 'origin/release/MAPL-v3' into feature/pc…
pchakraborty Nov 5, 2024
36f9c9f
StateItemSpec - overload write
pchakraborty Nov 5, 2024
b779f34
StateItemSpec - overload write: forgot tests/MockItemSpec in the last…
pchakraborty Nov 5, 2024
74e5f3e
Merge pull request #3154 from GEOS-ESM/feature/pchakrab/vertical-regr…
pchakraborty Nov 5, 2024
dd8abf0
Merge branch 'feature/pchakrab/stateitemspec-overload-write' into fea…
pchakraborty Nov 5, 2024
fea946e
Update generic3g/specs/InvalidSpec.F90
tclune Nov 5, 2024
741ee49
Merge branch 'release/MAPL-v3' into feature/pchakrab/stateitemspec-ov…
tclune Nov 5, 2024
10072fe
Module for tests for AccumulatorAction subtypes
darianboggs Nov 5, 2024
c1f55f5
Merge branch 'develop' into release/MAPL-v3
mathomp4 Nov 6, 2024
2232d0b
Fix space
mathomp4 Nov 6, 2024
e15ea74
mean calculate passes
darianboggs Nov 6, 2024
be9ed7e
Updates to tests
darianboggs Nov 6, 2024
619a7a5
Basic test of accumulate_mean_R4 passes
darianboggs Nov 6, 2024
c637bc9
Disabled scenarios test vertical_regridding_2 in generic3g so that gf…
pchakraborty Nov 7, 2024
0f54666
Merge branch 'release/MAPL-v3' into feature/pchakrab/stateitemspec-ov…
pchakraborty Nov 7, 2024
88195ea
All tests pass for MeanAccumulator.
darianboggs Nov 7, 2024
86aa37d
Further progress towards integrating support for info at Field and
tclune Nov 4, 2024
1d44448
Update field_bundle/tests/Test_FieldBundleDelta.pf
tclune Nov 7, 2024
d7e7e7f
Update generic3g/vertical/FixedLevelsVerticalGrid.F90
tclune Nov 7, 2024
c7a57bf
Update generic3g/vertical/FixedLevelsVerticalGrid.F90
tclune Nov 7, 2024
83c5248
Merge pull request #3156 from GEOS-ESM/feature/pchakrab/stateitemspec…
pchakraborty Nov 7, 2024
bb4bad4
Merge remote-tracking branch 'origin/release/MAPL-v3' into feature/pc…
pchakraborty Nov 7, 2024
99ffa3e
Fixes based upon code review.
tclune Nov 7, 2024
04de6fe
Merge branch 'release/MAPL-v3' into feature/tclune/mapl3-introduce-fi…
tclune Nov 7, 2024
67074f4
Merge pull request #3162 from GEOS-ESM/feature/tclune/mapl3-introduce…
tclune Nov 7, 2024
4384b80
Move common procedures for testing accumulators
darianboggs Nov 7, 2024
47c740b
Tests for MaxAccumulator pass
darianboggs Nov 7, 2024
95f0621
MinAccumlator tests pass
darianboggs Nov 8, 2024
9670fd3
Added variable 'units' to VerticalGrid and its accessors
pchakraborty Nov 8, 2024
dc48588
ModelVerticalGrid needs units for construction
pchakraborty Nov 8, 2024
a8a4c47
Catching exceptions for adapter match and adapt methods
pchakraborty Nov 8, 2024
579c589
Clean up unused variable.
darianboggs Nov 8, 2024
148e707
Merge remote-tracking branch 'origin/release/MAPL-v3' into feature/pc…
pchakraborty Nov 8, 2024
2312dee
FixedLevelsVerticalGrid - REAL32 replaced with ESMF_KIND_R4
pchakraborty Nov 8, 2024
e07e7d0
FieldSpec::adapt_vertical_grid - fixed a bug where the wrong units, o…
pchakraborty Nov 8, 2024
969e178
Cleaning up; add messages
darianboggs Nov 8, 2024
1fae71a
All tests pass. Cleaned up.
darianboggs Nov 8, 2024
7fda743
Eliminate commented out code
darianboggs Nov 8, 2024
2712c9c
Added a Scenarios test where component A (model vertical grid) export…
pchakraborty Nov 8, 2024
f1f68ea
Updated Test_ModelVerticalGrid.pf to work in the current situation wh…
pchakraborty Nov 8, 2024
7e6d09f
Fix test failing for NAG
darianboggs Nov 8, 2024
8631681
Merge branch 'release/MAPL-v3' into feature/wdboggs/accumulator_addit…
darianboggs Nov 8, 2024
b1a5d95
Bug fix in vertical_regridding_3 test scenario
pchakraborty Nov 8, 2024
9f00778
FieldSpec.F90 - vertical regridding possible only if typekinds match
pchakraborty Nov 9, 2024
37be22d
Fixes #3169 - handle duplicate dimensions
tclune Nov 11, 2024
d2f9b63
Merge pull request #3170 from GEOS-ESM/feature/tclune/#3169-allow-dup…
tclune Nov 11, 2024
732dc11
Cleaning up.
tclune Nov 8, 2024
ac6078c
Made Get and Set more symmetric
tclune Nov 8, 2024
c86def5
Merge remote-tracking branch 'origin/release/MAPL-v3' into feature/pc…
pchakraborty Nov 11, 2024
ee62984
First cut of FakeDyn gridcomp
pchakraborty Nov 11, 2024
4205f51
A bit of refactoring.
tclune Nov 11, 2024
b981567
OuterMetaComponent - added accessor get_vertical_grid
pchakraborty Nov 12, 2024
bd6241a
FakeDyn sets PL values
pchakraborty Nov 12, 2024
0a195e5
Updated Scenarios test vertical_regridding_3 to use FakeDyn gridcomp
pchakraborty Nov 12, 2024
824cab0
Initialized T in FakeDyn. Cleanup. Updated Scenarios test vertical_re…
pchakraborty Nov 12, 2024
eb9a4f0
Formatting
pchakraborty Nov 12, 2024
5ac1078
Merge pull request #3165 from GEOS-ESM/feature/pchakrab/vertical-regr…
pchakraborty Nov 12, 2024
9f77638
Merge remote-tracking branch 'origin/release/MAPL-v3' into feature/pc…
pchakraborty Nov 12, 2024
74ae24c
Merge branch 'develop' into release/MAPL-v3
mathomp4 Nov 12, 2024
4ecbb65
Fixed bug in previous commit.
tclune Nov 12, 2024
9162789
Change names of accumulator actions
darianboggs Nov 12, 2024
d217187
Added accessor for num_levels to MAPL_GridCompGet
pchakraborty Nov 12, 2024
082c4c2
Use MAPL_GridCompGet to access gridcomp's geom and num_levels
pchakraborty Nov 12, 2024
bd77e89
FakeDyn::CMakeLists.txt - cleanup
pchakraborty Nov 12, 2024
5bafd90
Merge branch 'release/MAPL-v3' into feature/tclune/#3163-refactor-sha…
tclune Nov 12, 2024
e5ed820
Changes to tests as well
darianboggs Nov 12, 2024
11394d1
Replaced MAPL_GridCompGet's accessor num_levels with vertical_grid
pchakraborty Nov 12, 2024
854b175
Merge pull request #3171 from GEOS-ESM/feature/tclune/#3163-refactor-…
mathomp4 Nov 12, 2024
133d91a
Merge branch 'release/MAPL-v3' into feature/wdboggs/accumulator_addit…
darianboggs Nov 12, 2024
1e60bd0
Update CHANGELOG.md
darianboggs Nov 12, 2024
00df122
Remove unused code.
darianboggs Nov 12, 2024
6702570
Fix failing test for gfortran
darianboggs Nov 12, 2024
1041b39
Moved FakeDynGridComp from top level gridcomps directory to generic3d…
pchakraborty Nov 13, 2024
372d637
Merge pull request #3166 from GEOS-ESM/feature/wdboggs/accumulator_ad…
tclune Nov 13, 2024
dbf8bd2
FixedLevelsVerticalGrid - replaced MAPL_GeomGet_ with assign_fptr_con…
pchakraborty Nov 13, 2024
a52d8b5
VerticalRegridAction - the linear interpolation transformation from s…
pchakraborty Nov 13, 2024
f8e9791
FakeDynGridComp - looks more like a user gridcomp
pchakraborty Nov 13, 2024
b132827
Merge branch 'release/MAPL-v3' into feature/pchakrab/fakedyn-gridcomp
tclune Nov 13, 2024
6a78134
Merge pull request #3173 from GEOS-ESM/feature/pchakrab/fakedyn-gridcomp
pchakraborty Nov 13, 2024
9d21354
Merge remote-tracking branch 'origin/release/MAPL-v3' into feature/pc…
pchakraborty Nov 13, 2024
d3c0385
Working
pchakraborty Nov 14, 2024
e0edfb7
Merge branch 'develop' into release/MAPL-v3
mathomp4 Nov 14, 2024
c6f436c
Working
pchakraborty Nov 14, 2024
a2cc0b5
Specify short names corresponding to standard_name
pchakraborty Nov 14, 2024
5514294
Merge remote-tracking branch 'origin/release/MAPL-v3' into feature/pc…
pchakraborty Nov 15, 2024
25b5756
Replaced the string array variants(2) with two variables
pchakraborty Nov 15, 2024
a5424b7
Updated Scenarios test vertical_regridding_2
pchakraborty Nov 15, 2024
8208aa6
Test_ModelVerticalGrid - updated to use the new ModelVerticalGrid int…
pchakraborty Nov 15, 2024
234ee55
Removed unused parameters
pchakraborty Nov 15, 2024
dece8a4
Enabling vertical regridding between variables with different vertica…
pchakraborty Nov 15, 2024
99613a3
Added check for value etc. in vertical_regridding scenarios test
pchakraborty Nov 15, 2024
810ebb4
Vertical regridding between variables with different vertical stagger
pchakraborty Nov 15, 2024
38f2d09
ModelVerticalLevel - removed unused modules
pchakraborty Nov 15, 2024
32b9fa3
Removed unnecessary returns
pchakraborty Nov 15, 2024
720f4f3
Modify procedures to use counter field instead
darianboggs Nov 19, 2024
a822786
Start creation of counter field
darianboggs Nov 19, 2024
fe9fb8b
Enforcing keyword argument in ModelVerticalGrid::add_short_name
pchakraborty Nov 19, 2024
a0cdfee
Merge branch 'feature/pchakrab/vertical-regridding' into feature/pcha…
pchakraborty Nov 19, 2024
3738ce3
Tests pass with counter field
darianboggs Nov 19, 2024
a2697de
Replace extension of base methods with hooks
darianboggs Nov 19, 2024
c6bddd8
Fix failing tests; delete unused code
darianboggs Nov 20, 2024
246e402
Merge pull request #3182 from GEOS-ESM/feature/pchakrab/vertical-regr…
pchakraborty Nov 20, 2024
0384572
Merge branch 'feature/pchakrab/vertical-regridding-fix-stagger-mismat…
pchakraborty Nov 20, 2024
679879b
Implement counter as I4 Field
darianboggs Nov 20, 2024
39ad737
Merge pull request #3190 from GEOS-ESM/feature/pchakrab/vertical-regr…
pchakraborty Nov 20, 2024
f834741
Fix I4 counter
darianboggs Nov 20, 2024
493db65
Minor formatting
pchakraborty Nov 21, 2024
e92c85e
Implements #3187 - added ability to allow testing array slices in Sce…
pchakraborty Nov 21, 2024
ad9328e
Check k_values at each horiz point
pchakraborty Nov 21, 2024
96c5325
Clean up and replace hooks procedures
darianboggs Nov 21, 2024
0a0c23c
Fix typo
darianboggs Nov 21, 2024
39103d1
Merge branch 'release/MAPL-v3' into feature/wdboggs/mapl3_time_averag…
darianboggs Nov 21, 2024
27e359c
Merge branch 'feature/wdboggs/mapl3_time_averaging_update' of github.…
darianboggs Nov 21, 2024
581cc45
Merge pull request #3192 from GEOS-ESM/feature/pchakrab/vertical-regr…
pchakraborty Nov 22, 2024
1a252df
Update tests for MeanAction
darianboggs Nov 22, 2024
52ae1d4
Merge branch 'release/MAPL-v3' into feature/wdboggs/mapl3_time_averag…
darianboggs Nov 22, 2024
1c0dab9
Update generic3g/actions/AccumulatorAction.F90
tclune Nov 22, 2024
72f877a
Replace if with select; add comments and blanklines
darianboggs Nov 22, 2024
f3c3910
Merge branch 'feature/wdboggs/mapl3_time_averaging_update' of github.…
darianboggs Nov 22, 2024
8af3a62
Fix filling of rc codes
darianboggs Nov 22, 2024
3d09448
Add final _RETURN(_SUCCESS)
darianboggs Nov 22, 2024
96c97ee
Merge pull request #3189 from GEOS-ESM/feature/wdboggs/mapl3_time_ave…
darianboggs Nov 22, 2024
69e0e64
Printing spec
pchakraborty Nov 25, 2024
db8cd4d
Refactored Test_ModelVerticalGrid.pf
pchakraborty Nov 25, 2024
7a3ff63
Updated ModelVerticalGrid::write_formatted
pchakraborty Nov 25, 2024
ebe3e79
Introduced field_edge/center in config file for model vertical grid, …
pchakraborty Nov 25, 2024
63f1e44
Minor formatting change
pchakraborty Nov 25, 2024
a9c122a
Add accumulation_type to FieldSpec
darianboggs Nov 25, 2024
302ddc1
Add accumulation_type to VariableSpec
darianboggs Nov 25, 2024
0df318c
Fix bugs with adding accumulation_type parameter
darianboggs Nov 25, 2024
94d76b5
Using VerticalGrid::can_connect_to to verify is two vertical grids ca…
pchakraborty Nov 25, 2024
52da958
Add test for accumulator_type; begin adapter
darianboggs Nov 25, 2024
a87817d
Minor change - updated message
pchakraborty Nov 26, 2024
23da80a
Added VerticalGrid::is_identical_to to check if the dst grid is ident…
pchakraborty Nov 26, 2024
9072369
Added BasicVerticalGrid::is_identical_to
pchakraborty Nov 26, 2024
a2e43da
Minor change in FixedLevelsVerticalGrid
pchakraborty Nov 26, 2024
d7e9e1b
FieldSpec - removed redundant modules
pchakraborty Nov 26, 2024
ef8cfb9
Add AccumulatorAdapter
darianboggs Nov 26, 2024
93deada
Merge remote-tracking branch 'origin/release/MAPL-v3' into bug/pchakr…
pchakraborty Nov 27, 2024
2a6d68c
gfortran has trouble with type bound write overload - deactivating it
pchakraborty Nov 27, 2024
49747b6
Scenarios tests vertical_regridding_2/3 are now active
pchakraborty Nov 27, 2024
898ad73
Merge branch 'develop' into release/MAPL-v3
mathomp4 Nov 27, 2024
742bbd4
FixedLevels/ModelVerticalGrid - reverting back to original write over…
pchakraborty Nov 27, 2024
7e90fd8
Merge branch 'release/MAPL-v3' into bug/pchakrab/vertical-regridding-…
pchakraborty Nov 27, 2024
6cbfd87
Fixing coupling for AccumulatorAction
darianboggs Nov 27, 2024
d1f4682
Merge branch 'release/MAPL-v3' into feature/pchakrab/vertical-regridd…
pchakraborty Nov 29, 2024
34cec8e
Improvements to OuterMetaComponent
tclune Dec 2, 2024
7b5fab0
Merge pull request #3194 from GEOS-ESM/feature/pchakrab/vertical-regr…
pchakraborty Dec 2, 2024
0b24b7a
Turns out that we need to ifdef only the generic statement
pchakraborty Dec 2, 2024
50eb3cd
Cleaned up - removed commented ifdef's
pchakraborty Dec 2, 2024
7f97efd
Merge remote-tracking branch 'origin/release/MAPL-v3' into bug/pchakr…
pchakraborty Dec 2, 2024
af5cd63
Merge branch 'release/MAPL-v3' into feature/tclune/refactor-outer-meta
mathomp4 Dec 2, 2024
e54d82c
Updates to use fieldspec changes
darianboggs Dec 2, 2024
9fe42d0
Merge pull request #3200 from GEOS-ESM/feature/tclune/refactor-outer-…
tclune Dec 2, 2024
08b66c6
Merge branch 'release/MAPL-v3' into bug/pchakrab/vertical-regridding-…
tclune Dec 2, 2024
48398c0
Fix failing compilation
darianboggs Dec 2, 2024
f44731d
Merge branch 'release/MAPL-v3' into feature/wdboggs/fieldspec_add_acc…
darianboggs Dec 2, 2024
40c1f3d
Add accumulation_type variable; make AccumulatorAction get function
darianboggs Dec 2, 2024
fa1f8a5
Merge branch 'release/MAPL-v3' into feature/wdboggs/fieldspec_add_acc…
darianboggs Dec 2, 2024
d7341ff
Update CHANGELOG.md
darianboggs Dec 2, 2024
f7ef6f8
Merge branch 'release/MAPL-v3' into feature/wdboggs/varspec_add_accum…
darianboggs Dec 2, 2024
dc57ada
Merge pull request #3204 from GEOS-ESM/feature/wdboggs/fieldspec_add_…
darianboggs Dec 2, 2024
137d3bf
Merge branch 'release/MAPL-v3' into feature/wdboggs/varspec_add_accum…
darianboggs Dec 2, 2024
fe97770
Merge branch 'release/MAPL-v3' into bug/pchakrab/vertical-regridding-…
pchakraborty Dec 2, 2024
3101d25
Add accumulation_type to VariableSpec; set FieldSpec accumulation_typ…
darianboggs Dec 2, 2024
772b1f6
Remove extra blank line
darianboggs Dec 2, 2024
cb8a036
Update CHANGELOG.md
darianboggs Dec 2, 2024
4c9ebbe
Merge pull request #3195 from GEOS-ESM/bug/pchakrab/vertical-regriddi…
pchakraborty Dec 2, 2024
2147840
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 3, 2024
de33ef3
Merge branch 'release/MAPL-v3' into feature/wdboggs/varspec_add_accum…
darianboggs Dec 3, 2024
10dbdcc
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 3, 2024
aaf55ed
Merge branch 'release/MAPL-v3' into feature/wdboggs/varspec_add_accum…
darianboggs Dec 3, 2024
5d2446c
Merge pull request #3205 from GEOS-ESM/feature/wdboggs/varspec_add_ac…
darianboggs Dec 3, 2024
5d79f4c
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 3, 2024
bd99fe0
Minor formatting change
pchakraborty Dec 4, 2024
d19834c
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 5, 2024
0d5636e
Clean up of configurable gridcomps
pchakraborty Dec 5, 2024
9a6146e
Switch Scenarios tests from using libsimple to libconfigurable
pchakraborty Dec 5, 2024
d25b7c0
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 5, 2024
810f777
Add run_dt to ComponentSpec
darianboggs Dec 5, 2024
c71f3ee
Configurables are not setting the vertical grid anymore
pchakraborty Dec 5, 2024
519a312
Re-activating history_1
pchakraborty Dec 5, 2024
64e63ae
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 5, 2024
c3ad6df
Existing tests pass
darianboggs Dec 5, 2024
21c1bff
New test passes
darianboggs Dec 5, 2024
807dcc5
Update CHANGELOG.md
darianboggs Dec 5, 2024
304f280
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 6, 2024
feead03
Merge branch 'release/MAPL-v3' into feature/wdboggs/component_timestep
darianboggs Dec 6, 2024
5ac822c
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 6, 2024
949e77e
Commit fix due to develop merge per @darianboggs
mathomp4 Dec 6, 2024
15c5699
Merge branch 'release/MAPL-v3' into feature/wdboggs/component_timestep
mathomp4 Dec 6, 2024
676346a
Turn off ifx MAPL3
mathomp4 Dec 6, 2024
ff7e6b0
Merge branch 'release/MAPL-v3' into feature/wdboggs/component_timestep
mathomp4 Dec 6, 2024
3a52c18
Explicitly allocating vertical grid in FieldSpec::adapt_vertical_grid
pchakraborty Dec 6, 2024
24a534b
Replaced Configurable Leaf and Parent with a single Configurable grid…
pchakraborty Dec 6, 2024
005869b
Using libconfigurable instead of libconfigurable_parent
pchakraborty Dec 6, 2024
d0a1ede
Using libconfigurable instead of libconfigurable_leaf/parent
pchakraborty Dec 6, 2024
be97ada
Merge pull request #3221 from GEOS-ESM/feature/wdboggs/component_time…
darianboggs Dec 6, 2024
7fad5a3
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 6, 2024
6fe3c7b
Add run_dt to VariableSpec and FieldSpec
darianboggs Dec 6, 2024
7cd68a1
Merge branch 'release/MAPL-v3' into feature/wdboggs/add_run_dt_to_fie…
darianboggs Dec 6, 2024
f15d54e
Merge branch 'release/MAPL-v3' into feature/pchakrab/update-configura…
pchakraborty Dec 6, 2024
332e3c6
add run_dt: ComponentSpec, VariableSpec, FieldSpec
darianboggs Dec 6, 2024
9567ee3
Added /lib to LD_LIBRARY_PATH of MAPL.generic3g.tests
pchakraborty Dec 7, 2024
a7e412e
libconfigurable_parent/leaf_gridcomp -> libconfigurable_gridcomp
pchakraborty Dec 8, 2024
4a16f59
Add loggers when reading and writing weights
mathomp4 Dec 9, 2024
ff54749
Fix typo
mathomp4 Dec 9, 2024
c208f62
Configurable adds a vertical grid (BasicVerticalGrid(5)) to the gridc…
pchakraborty Dec 9, 2024
1028921
Removed Simple Leaf/Parent gridcomps and associated bootstrap tests
pchakraborty Dec 9, 2024
3c0e4fd
Added vertical_grid to cap3g test configs
pchakraborty Dec 10, 2024
0369a94
ConfigurableGridComp - cleanup
pchakraborty Dec 10, 2024
02e7a91
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 10, 2024
b134aa2
Merge branch 'develop' into feature/mathomp4/weight-logger
mathomp4 Dec 10, 2024
93bf4e2
Merge remote-tracking branch 'origin/release/MAPL-v3' into feature/pc…
pchakraborty Dec 10, 2024
428fb37
Merge pull request #3231 from GEOS-ESM/feature/pchakrab/update-config…
tclune Dec 10, 2024
4dbc5e3
Merge pull request #3233 from GEOS-ESM/feature/mathomp4/weight-logger
mathomp4 Dec 10, 2024
39d4278
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 10, 2024
761185e
Merge branch 'release/MAPL-v3' into feature/wdboggs/add_run_dt_to_fie…
darianboggs Dec 10, 2024
3937be6
Remove run_dt from VariableSpec
darianboggs Dec 10, 2024
115f172
Rm unnecessary change to VariableSpec
darianboggs Dec 10, 2024
7c1ed9e
Update CHANGELOG.md
darianboggs Dec 10, 2024
f9eae91
Add run_dt to make_itemSpec
darianboggs Dec 11, 2024
d3cd293
Merge branch 'feature/wdboggs/add_run_dt_to_field_specs' of github.co…
darianboggs Dec 11, 2024
28f389c
fixes #3242
bena-nasa Dec 11, 2024
f97ca09
change i5 to i0
bena-nasa Dec 11, 2024
5508115
Add run_dt to set_blanket_geom
darianboggs Dec 11, 2024
6ef3cfe
Merge pull request #3243 from GEOS-ESM/feature/bmauer/fixes-#3242
bena-nasa Dec 11, 2024
4cfa466
Add use statements for ESMF
darianboggs Dec 11, 2024
0434ad9
Merge pull request #3240 from GEOS-ESM/feature/wdboggs/add_run_dt_to_…
tclune Dec 11, 2024
7833155
ConfigurableGridComp - cleanup
pchakraborty Dec 11, 2024
de255e3
BasicVerticalGrid::can_connect_to fails if dst id is different from t…
pchakraborty Dec 11, 2024
e2aceda
Merge branch 'develop' into release/MAPL-v3
mathomp4 Dec 11, 2024
b85db7a
Merge branch 'release/MAPL-v3' into feature/pchakrab/update-configura…
pchakraborty Dec 12, 2024
0d4ae10
Merge pull request #3245 from GEOS-ESM/feature/pchakrab/update-config…
tclune Dec 12, 2024
944cf2c
Initial implementation of StateItemAspect.
tclune Dec 14, 2024
91f359f
Workaround for GNU
tclune Dec 16, 2024
0d5ba7b
Merge pull request #3249 from GEOS-ESM/feature/tclune/#3247-introduce…
tclune Dec 16, 2024
1e994ce
Changes to fix array problem
darianboggs Dec 19, 2024
8bc8235
consolodate grid creation in subroutine
darianboggs Dec 19, 2024
e3b6480
initialize_field use grid from accumulation_field
darianboggs Dec 20, 2024
68b0370
Fixed bug with NAG for MaxAction as well as others
darianboggs Jan 2, 2025
c8aa7f2
Update CHANGELOG.md
darianboggs Jan 2, 2025
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
2 changes: 1 addition & 1 deletion generic3g/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ esma_add_fortran_submodules(
initialize_realize.F90 recurse.F90 apply_to_children_custom.F90
initialize_user.F90 run_custom.F90 run_user.F90 run_clock_advance.F90
read_restart.F90 write_restart.F90 get_name.F90 get_gridcomp.F90
set_geom.F90 set_vertical_grid.F90 get_registry.F90
set_geom.F90 set_vertical_grid.F90 get_vertical_grid.F90 get_registry.F90
get_component_spec.F90 get_internal_state.F90 get_lgr.F90
get_user_gc_driver.F90 connect_all.F90 set_entry_point.F90
finalize.F90)
8 changes: 7 additions & 1 deletion generic3g/MAPL_Generic.F90
Original file line number Diff line number Diff line change
@@ -218,6 +218,7 @@ subroutine gridcomp_get(gridcomp, unusable, &
logger, &
registry, &
geom, &
vertical_grid, &
rc)

type(ESMF_GridComp), intent(inout) :: gridcomp
@@ -227,10 +228,11 @@ subroutine gridcomp_get(gridcomp, unusable, &
class(Logger_t), optional, pointer, intent(out) :: logger
type(StateRegistry), optional, pointer, intent(out) :: registry
type(ESMF_Geom), optional, intent(out) :: geom
class(VerticalGrid), allocatable, optional, intent(out) :: vertical_grid
integer, optional, intent(out) :: rc

integer :: status
type(OuterMetaComponent), pointer :: outer_meta_
type(OuterMetaComponent), pointer :: outer_meta_, outer_meta_from_inner_gc

call MAPL_GridCompGetOuterMeta(gridcomp, outer_meta_, _RC)

@@ -239,6 +241,10 @@ subroutine gridcomp_get(gridcomp, unusable, &
if (present(logger)) logger => outer_meta_%get_lgr()
if (present(registry)) registry => outer_meta_%get_registry()
if (present(geom)) geom = outer_meta_%get_geom()
if (present(vertical_grid)) then
outer_meta_from_inner_gc => get_outer_meta_from_inner_gc(gridcomp, _RC)
vertical_grid = outer_meta_from_inner_gc%get_vertical_grid()
end if

_RETURN(_SUCCESS)
_UNUSED_DUMMY(unusable)
6 changes: 6 additions & 0 deletions generic3g/OuterMetaComponent.F90
Original file line number Diff line number Diff line change
@@ -116,6 +116,7 @@ module mapl3g_OuterMetaComponent
procedure :: get_internal_state

procedure :: set_vertical_grid
procedure :: get_vertical_grid

procedure :: connect_all

@@ -365,6 +366,11 @@ module subroutine set_vertical_grid(this, vertical_grid)
class(VerticalGrid), intent(in) :: verticaL_grid
end subroutine set_vertical_grid

module function get_vertical_grid(this) result(vertical_grid)
class(VerticalGrid), allocatable :: verticaL_grid
class(OuterMetaComponent), intent(inout) :: this
end function get_vertical_grid

module function get_registry(this) result(registry)
type(StateRegistry), pointer :: registry
class(OuterMetaComponent), target, intent(in) :: this
15 changes: 15 additions & 0 deletions generic3g/OuterMetaComponent/get_vertical_grid.F90
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#include "MAPL_Generic.h"

submodule (mapl3g_OuterMetaComponent) get_vertical_grid_smod

implicit none

contains

module function get_vertical_grid(this) result(vertical_grid)
class(VerticalGrid), allocatable :: verticaL_grid
class(OuterMetaComponent), intent(inout) :: this
vertical_grid = this%vertical_grid
end function get_vertical_grid

end submodule get_vertical_grid_smod
80 changes: 42 additions & 38 deletions generic3g/actions/VerticalRegridAction.F90
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ module mapl3g_VerticalRegridAction
use mapl3g_CouplerPhases, only: GENERIC_COUPLER_UPDATE
use mapl3g_VerticalRegridMethod
use mapl3g_VerticalLinearMap, only: compute_linear_map
use mapl3g_CSR_SparseMatrix, only: SparseMatrix_sp => CSR_SparseMatrix_sp, matmul, shape
use mapl3g_CSR_SparseMatrix, only: SparseMatrix_sp => CSR_SparseMatrix_sp, matmul
use mapl3g_FieldCondensedArray, only: assign_fptr_condensed_array
use esmf

@@ -58,64 +58,31 @@ function new_VerticalRegridAction(v_in_coord, v_in_coupler, v_out_coord, v_out_c
end function new_VerticalRegridAction

subroutine initialize(this, importState, exportState, clock, rc)
use esmf
class(VerticalRegridAction), intent(inout) :: this
type(ESMF_State) :: importState
type(ESMF_State) :: exportState
type(ESMF_Clock) :: clock
integer, optional, intent(out) :: rc

real(ESMF_KIND_R4), pointer :: v_in(:, :, :), v_out(:, :, :)
integer :: shape_in(3), shape_out(3), n_horz, n_ungridded
integer :: horz, ungrd, status

_ASSERT(this%method == VERTICAL_REGRID_LINEAR, "regrid method can only be linear")

! if (associated(this%v_in_coupler)) then
! call this%v_in_coupler%initialize(_RC)
! end if

! if (associated(this%v_out_coupler)) then
! call this%v_out_coupler%initialize(_RC)
! end if

call assign_fptr_condensed_array(this%v_in_coord, v_in, _RC)
shape_in = shape(v_in)
n_horz = shape_in(1)
n_ungridded = shape_in(3)

call assign_fptr_condensed_array(this%v_out_coord, v_out, _RC)
shape_out = shape(v_out)
_ASSERT((shape_in(1) == shape_out(1)), "horz dims are expected to be equal")
_ASSERT((shape_in(3) == shape_out(3)), "ungridded dims are expected to be equal")

allocate(this%matrix(n_horz))

! TODO: Convert to a `do concurrent` loop
do horz = 1, n_horz
do ungrd = 1, n_ungridded
associate(src => v_in(horz, :, ungrd), dst => v_out(horz, :, ungrd))
call compute_linear_map(src, dst, this%matrix(horz), _RC)
end associate
end do
end do

_RETURN(_SUCCESS)
_UNUSED_DUMMY(importState)
_UNUSED_DUMMY(exportState)
_UNUSED_DUMMY(clock)
end subroutine initialize

subroutine update(this, importState, exportState, clock, rc)
use esmf
class(VerticalRegridAction), intent(inout) :: this
type(ESMF_State) :: importState
type(ESMF_State) :: exportState
type(ESMF_Clock) :: clock
integer, optional, intent(out) :: rc

integer :: status
type(ESMF_Field) :: f_in, f_out
real(ESMF_KIND_R4), pointer :: x_in(:,:,:), x_out(:,:,:)
integer :: shape_in(3), shape_out(3), n_horz, n_ungridded
integer :: horz, ungrd
integer :: horz, ungrd, status

! if (associated(this%v_in_coupler)) then
! call this%v_in_coupler%run(phase_idx=GENERIC_COUPLER_UPDATE, _RC)
@@ -125,6 +92,8 @@ subroutine update(this, importState, exportState, clock, rc)
! call this%v_out_coupler%run(phase_idx=GENERIC_COUPLER_UPDATE, _RC)
! end if

call compute_interpolation_matrix_(this%v_in_coord, this%v_out_coord, this%matrix, _RC)

call ESMF_StateGet(importState, itemName='import[1]', field=f_in, _RC)
call assign_fptr_condensed_array(f_in, x_in, _RC)
shape_in = shape(x_in)
@@ -143,6 +112,7 @@ subroutine update(this, importState, exportState, clock, rc)
end do

_RETURN(_SUCCESS)
_UNUSED_DUMMY(clock)
end subroutine update

subroutine write_formatted(this, unit, iotype, v_list, iostat, iomsg)
@@ -177,4 +147,38 @@ subroutine write_formatted(this, unit, iotype, v_list, iostat, iomsg)
_UNUSED_DUMMY(v_list)
end subroutine write_formatted

subroutine compute_interpolation_matrix_(v_in_coord, v_out_coord, matrix, rc)
type(ESMF_Field), intent(inout) :: v_in_coord
type(ESMF_Field), intent(inout) :: v_out_coord
type(SparseMatrix_sp), allocatable, intent(out) :: matrix(:)
integer, optional, intent(out) :: rc

real(ESMF_KIND_R4), pointer :: v_in(:, :, :), v_out(:, :, :)
integer :: shape_in(3), shape_out(3), n_horz, n_ungridded
integer :: horz, ungrd, status

call assign_fptr_condensed_array(v_in_coord, v_in, _RC)
shape_in = shape(v_in)
n_horz = shape_in(1)
n_ungridded = shape_in(3)

call assign_fptr_condensed_array(v_out_coord, v_out, _RC)
shape_out = shape(v_out)
_ASSERT((shape_in(1) == shape_out(1)), "horz dims are expected to be equal")
_ASSERT((shape_in(3) == shape_out(3)), "ungridded dims are expected to be equal")

allocate(matrix(n_horz))

! TODO: Convert to a `do concurrent` loop
do horz = 1, n_horz
do ungrd = 1, n_ungridded
associate(src => v_in(horz, :, ungrd), dst => v_out(horz, :, ungrd))
call compute_linear_map(src, dst, matrix(horz), _RC)
end associate
end do
end do

_RETURN(_SUCCESS)
end subroutine compute_interpolation_matrix_

end module mapl3g_VerticalRegridAction
Loading