Commit 3bee8a5
authored
Port Python bridge off MAPL.generic to compile with MAPL3 (#4728)
* Port Python bridge off MAPL.generic to compile with MAPL3
- Replace MAPL.generic link dep with MAPL.generic3g in CMakeLists.txt
- Drop use MAPL_GenericMod in PythonBridge.F90 and python_fortran_bridge.F90
- MAPL_MetaComp -> ESMF_GridComp in all argument declarations
- MAPL_GetPointer (preprocessor macro, gone in MAPL3) -> MAPL_StateGetPointer
- MAPL_GetResource -> MAPL_GridCompGetResource (reordered args)
- MAPL_Get(state, LM=) -> MAPL_GridCompGet(state, num_levels=)
- MAPL_Get(state, IM/JM/NX/NY=) -> _FAIL() with explanatory message;
these were already no-op stubs in MAPL2 and have no direct MAPL3
equivalent yet (requires geom API, tracked in MAPL#4724)
Closes #4724
* Complete variable renames and replace ESMF_AttributeGet with ESMF_Info API
- Rename esmf_state_c_ptr -> state_c_ptr in State-taking functions
- Rename state_c_ptr/mapl_metacomp_c_ptr -> gridcomp_c_ptr in GridComp-taking functions
- Rename c_mapl_state -> c_gridcomp in MAPL_Get* functions
- Rename time_state_c_ptr -> time_interval_c_ptr, state -> time_interval in TimeIntervalGet
- Replace deprecated ESMF_AttributeGet with ESMF_InfoGetFromHost + ESMF_InfoGet
* Fix Python bridge CMake deps: MAPL.generic -> MAPL.generic3g only
* Add MAPL (mapl3g) back to python bridge deps for PythonBridge.F90
* Simplify python bridge deps to just MAPL (generic3g comes transitively)
* Move MAPL.python_bridge ownership from MAPL2 to MAPL (mapl3g)
* Fix bridge: use Generic3g not MAPL, use MAPL.generic3g not MAPL in deps1 parent 28c48f6 commit 3bee8a5
7 files changed
Lines changed: 120 additions & 154 deletions
File tree
- MAPL
- Python
- MAPL_PythonBridge/python2fortran
- mapl3g
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | 16 | | |
18 | 17 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
| 90 | + | |
91 | 91 | | |
92 | | - | |
| 92 | + | |
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
| |||
0 commit comments