Skip to content

Commit 73c5c4d

Browse files
POOLS: Adding pools to MPAS. Framework and cores.
This commit changes several portions of the MPAS code. It is a combination of work done by Michael Duda, Matt Hoffman, and , Doug Jacobsen. In the framework, the follow changes occured. - The pool data types were defined. Currently they are in the mpas_grid_types module. - Registry was updated to only generate code for pool data structures. - The framework was modified to generate and use pool data structures for: var_structs, packages, and namelist records / options. Each core has additionally been updated to use pools. Results should be bit-identical to the previous commit for every core.
1 parent 5097a37 commit 73c5c4d

File tree

150 files changed

+22707
-10891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+22707
-10891
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ else
319319
GEN_F90_MESSAGE="MPAS was built with .F files."
320320
endif
321321

322-
323322
ifneq ($(wildcard .mpas_core_*), ) # CHECK FOR BUILT CORE
324323

325324
ifneq ($(wildcard .mpas_core_$(CORE)), ) # CHECK FOR SAME CORE AS ATTEMPTED BUILD.

src/core_atmosphere/Registry.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@
876876
<!-- ************************************** Variables *************************************** -->
877877
<!-- **************************************************************************************** -->
878878

879-
<var_struct name="mesh" time_levs="0">
879+
<var_struct name="mesh" time_levs="1">
880880

881881
<!-- horizontal grid structure -->
882882
<var name="latCell" type="real" dimensions="nCells"/>
@@ -1136,7 +1136,7 @@
11361136
<var name="tend_w_buoy" name_in_code="w_buoy" type="real" dimensions="nVertLevelsP1 nCells Time"/>
11371137

11381138
<!-- scalar tendencies -->
1139-
<var_array name="scalars" type="real" dimensions="nVertLevels nCells Time">
1139+
<var_array name="scalars_tend" type="real" dimensions="nVertLevels nCells Time">
11401140
<var name="tend_qv" name_in_code="qv" array_group="moist"/>
11411141
<var name="tend_qc" name_in_code="qc" array_group="moist"/>
11421142
<var name="tend_qr" name_in_code="qr" array_group="moist"/>
@@ -1690,13 +1690,13 @@
16901690
<var name="rthratenlw" type="real" dimensions="nVertLevels nCells Time"/>
16911691
</var_struct>
16921692

1693-
<var_struct name="atm_input" time_levs="0">
1693+
<var_struct name="atm_input" time_levs="1">
16941694
<!-- Monthly mean ozone climatology used in the CAM and RRTMG radiation codes -->
16951695
<var name="pin" type="real" dimensions="nOznLevels"/>
16961696
<var name="ozmixm" type="real" dimensions="nMonths nOznLevels nCells"/>
16971697
</var_struct>
16981698

1699-
<var_struct name="sfc_input" time_levs="0">
1699+
<var_struct name="sfc_input" time_levs="1">
17001700

17011701
<!-- ================================================================================================== -->
17021702
<!-- ... SURFACE CHARACTERISTICS THAT NEED TO BE READ FROM GRID.NC: -->

0 commit comments

Comments
 (0)