Porting to MAPL3

CMakeLists.txt

@@ -185,7 +185,9 @@ endif ()
 
 # Install the resource files
 set (resource_files
-  fv3sa.yaml
+  dyn.yaml
+  dyn-sa.yaml
+  data-moist.yaml
 )
 install(FILES ${resource_files} DESTINATION etc)
 

DynCore_StateSpecs.rc

@@ -234,6 +234,7 @@ category: EXPORT
   U_DYN_IN       |  u_wind_at_begin_of_time_step                                             |  m s-1             |  xyz  |  C   |                    |
   V_DYN_IN       |  v_wind_at_begin_of_time_step                                             |  m s-1             |  xyz  |  C   |                    |
   PLE_DYN_IN     |  edge_pressure_at_begin_of_time_step                                      |  Pa                |  xyz  |  E   |                    |
+  PLE4           | blah_blah_blah                                                            | Pa                 |  xyz  |  E   |                    |
 
 
 category: IMPORT

FV_StateMod.F90

@@ -1299,7 +1299,6 @@ subroutine FV_Run (STATE, EXPORT, CLOCK, GC, PLE0, RC)
 #endif
 
   type(ESMF_VM) :: vm_
-  integer :: comm_, irank_, nranks_, mpierr_
 
 ! Begin
 

data-moist.yaml

@@ -0,0 +1,58 @@
+mapl:
+  states:
+    internal:
+      Q:
+        standard_name: "specific_humidity"
+        units: "kg kg-1"
+        vertical_dim_spec: "c"
+        fill_value: 0.0
+      QLLS:
+        standard_name: "mass_fraction_of_large_scale_cloud_liquid_water"
+        units: "kg kg-1"
+        vertical_dim_spec: "c"
+        fill_value: 0.0
+      QLCN:
+        standard_name: "mass_fraction_of_convective_cloud_liquid_water"
+        units: "kg kg-1"
+        vertical_dim_spec: "c"
+        fill_value: 0.0
+      QILS:
+        standard_name: "mass_fraction_of_large_scale_cloud_ice_water"
+        units: "kg kg-1"
+        vertical_dim_spec: "c"
+        fill_value: 0.0
+      QICN:
+        standard_name: "mass_fraction_of_convective_cloud_ice_water"
+        units: "kg kg-1"
+        vertical_dim_spec: "c"
+        fill_value: 0.0
+      CLLS:
+        standard_name: "large_scale_cloud_area_fraction"
+        units: "1"
+        vertical_dim_spec: "c"
+        fill_value: 0.0
+      CLCN:
+        standard_name: "convective_cloud_area_fraction"
+        units: "1"
+        vertical_dim_spec: "c"
+        fill_value: 0.0
+      QRAIN:
+        standard_name: "mass_fraction_of_rain"
+        units: "kg kg-1"
+        vertical_dim_spec: "c"
+        fill_value: 0.0
+      QSNOW:
+        standard_name: "mass_fraction_of_snow"
+        units: "kg kg-1"
+        vertical_dim_spec: "c"
+        fill_value: 0.0
+      QGRAUPEL:
+        standard_name: "mass_fraction_of_graupel"
+        units: "kg kg-1"
+        vertical_dim_spec: "c"
+        fill_value: 0.0
+
+    import:
+      TRADV:
+        class: service
+        items: [Q, QLLS, QLCN, QILS, QICN, CLLS, CLCN, QRAIN, QSNOW, QGRAUPEL]

dyn.yaml

@@ -0,0 +1,28 @@
+---
+DEBUG_DYN: true
+RUN_DT: 1800
+DYCORE: FV3
+COLDSTART: false
+ADIABATIC: true
+EXCLUDE_ADVECTION_TRACERS_LIST: []
+
+geometry:
+  esmf_geom:
+    class: CubedSphere
+    im_world: 12
+    nx_face: 1
+    ny_face: 1
+  vertical_grid:
+    class: model
+    standard_name: air_pressure
+    units: hPa
+    num_levels: 91
+    field_edge: PLE
+    field_center: PE
+
+mapl:
+  misc:
+    restart:
+      internal: true
+    checkpoint:
+      internal: true