Sync main with develop

.circleci/config.yml

@@ -1,8 +1,8 @@
 version: 2.1
 
 # Anchors to prevent forgetting to update a version
-baselibs_version: &baselibs_version v7.5.0
-bcs_version: &bcs_version v10.22.3
+baselibs_version: &baselibs_version v7.7.0
+bcs_version: &bcs_version v10.23.0
 
 orbs:
   ci: geos-esm/circleci-tools@1

.github/workflows/enforce-labels.yml

@@ -0,0 +1,29 @@
+name: Enforce PR Labels
+
+on:
+  pull_request:
+    types: [opened, labeled, unlabeled, edited, synchronize]
+
+jobs:
+  require-label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mheap/github-action-required-labels@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          mode: minimum
+          count: 1
+          labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled"
+          add_comment: true
+  blocking-label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mheap/github-action-required-labels@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          mode: exactly
+          count: 0
+          labels: "Contingent - DNA,Needs Lead Approval,Contingent -- Do Not Approve"
+          add_comment: true

CMakeLists.txt

@@ -4,3 +4,7 @@ esma_add_library (${this}
   SRCS GEOS_OceanGridComp.F90
   SUBCOMPONENTS MOM6_GEOSPlug MOM_GEOS5PlugMod GEOSdatasea_GridComp
   DEPENDENCIES GEOSdatasea_GridComp MAPL esmf)
+
+mapl_acg (${this}  GEOS_Ocean_StateSpecs.rc
+          IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
+          GET_POINTERS DECLARE_POINTERS)

GEOS_Ocean_StateSpecs.rc

@@ -0,0 +1,64 @@
+schema_version: 2.0.0
+component: Ocean
+
+category: IMPORT
+#---------------------------------------------------------------------------------------------------------------------
+#  VARIABLE                  |   DIMENSIONS        |          Additional Metadata
+#---------------------------------------------------------------------------------------------------------------------
+NAME        |   UNITS        |   DIMS   |   VLOC   |   COND                        |   DATATYPE          |   LONG_NAME 
+#---------------------------------------------------------------------------------------------------------------------
+FROCEAN     |   1            |   xy     |   N      |                               |                     |   fraction_of_gridbox_covered_by_ocean 
+TAUX        |   N m-2        |   xy     |   N      |                               |                     |   Agrid_eastward_stress_on_ocean 
+TAUY        |   N m-2        |   xy     |   N      |                               |                     |   Agrid_northward_stress_on_ocean 
+PENUVR      |   W m-2        |   xy     |   N      |                               |                     |   net_downward_penetrating_direct_UV_flux 
+PENPAR      |   W m-2        |   xy     |   N      |                               |                     |   net_downward_penetrating_direct_PAR_flux 
+PENUVF      |   W m-2        |   xy     |   N      |                               |                     |   net_downward_penetrating_diffuse_UV_flux 
+PENPAF      |   W m-2        |   xy     |   N      |                               |                     |   net_downward_penetrating_diffuse_PAR_flux 
+DRNIR       |   W m-2        |   xy     |   N      |                               |                     |   net_surface_downwelling_nir_beam_flux 
+DFNIR       |   W m-2        |   xy     |   N      |                               |                     |   net_surface_downwelling_nir_diffuse_flux 
+SWHEAT      |   W m-2        |   xyz    |   C      |                               |                     |   solar_heating_rate 
+DISCHARGE   |   kg m-2 s-1   |   xy     |   N      |                               |                     |   river_discharge_at_ocean_points 
+TR          |   1            |   xyz    |   C      |   trim(OCEAN_NAME) == 'MOM'   |   MAPL_BundleItem   |   tracer_mixing_ratios 
+TRFLUX      |   X            |   xy     |   N      |   trim(OCEAN_NAME) == 'MOM'   |   MAPL_BundleItem   |   surface_fluxes_of_tracers 
+LWFLX       |   W m-2        |   xy     |   N      |                               |                     |   surface_net_downward_longwave_flux 
+SHFLX       |   W m-2        |   xy     |   N      |                               |                     |   upward_sensible_heat_flux 
+QFLUX       |   kg m-2 s-1   |   xy     |   N      |                               |                     |   evaporation 
+SNOW        |   kg m-2 s-1   |   xy     |   N      |                               |                     |   ocean_snowfall 
+RAIN        |   kg m-2 s-1   |   xy     |   N      |                               |                     |   ocean_rainfall 
+FRESH       |   kg m-2 s-1   |   xy     |   N      |                               |                     |   fresh_water_flux_due_to_ice_dynamics 
+FSALT       |   kg m-2 s-1   |   xy     |   N      |                               |                     |   salt_flux_due_to_ice_dynamics 
+FHOCN       |   W m-2        |   xy     |   N      |                               |                     |   heat_flux_due_to_ice_dynamics 
+PEN_OCN     |   W m-2        |   xy     |   N      |                               |                     |   penetrated_shortwave_flux_at_the_bottom_of_first_ocean_model_layer 
+FRACICEd    |   1            |   xy     |   N      |   dual_ocean                  |                     |   fractional_cover_of_seaice 
+
+category: INTERNAL
+#---------------------------------------------------------------------------------------------
+#  VARIABLE            |   DIMENSIONS        |          Additional Metadata
+#---------------------------------------------------------------------------------------------
+NAME       |   UNITS   |   DIMS   |   VLOC   |   FRIENDLYTO        |   DEFAULT   |   LONG_NAME  
+#---------------------------------------------------------------------------------------------
+TS_FOUND   |   K       |   xy     |   N      |   trim(COMP_NAME)   |   280.0     |   foundation_temperature_for_interface_layer  
+
+category: EXPORT
+#---------------------------------------------------------------------------------------------
+#  VARIABLE                  |   DIMENSIONS        |   Additional Metadata
+#---------------------------------------------------------------------------------------------
+NAME        |   UNITS        |   DIMS   |   VLOC   |   LONG_NAME
+#---------------------------------------------------------------------------------------------
+#MASKO       |   1            |   xy     |   N      |   ocean_mask  
+SS_FOUND    |   PSU          |   xy     |   N      |   foundation_salinity_for_interface_layer  
+FRZMLT      |   W m-2        |   xy     |   N      |   freeze_melt_potential  
+TAUX        |   N m-2        |   xy     |   N      |   Agrid_eastward_stress_on_ocean  
+TAUY        |   N m-2        |   xy     |   N      |   Agrid_northward_stress_on_ocean  
+SWHEAT      |   W m-2        |   xyz    |   C      |   solar_heating_rate  
+RFLUX       |   W m-2        |   xy     |   N      |   downward_radiative_heat_flux_at_ocean_bottom  
+DISCHARGE   |   kg m-2 s-1   |   xy     |   N      |   river_discharge_at_ocean_points  
+FROCEAN     |   1            |   xy     |   N      |   fraction_of_gridbox_covered_by_ocean  
+LWFLX       |   W m-2        |   xy     |   N      |   surface_net_downward_longwave_flux  
+SWFLX       |   W m-2        |   xy     |   N      |   surface_net_downward_shortwave_flux  
+SHFLX       |   W m-2        |   xy     |   N      |   upward_sensible_heat_flux  
+QFLUX       |   kg m-2 s-1   |   xy     |   N      |   evaporation  
+SFLX        |   kg m-2 s-1   |   xy     |   N      |   salt_flux_due_to_ice_dynamics  
+RAIN        |   kg m-2 s-1   |   xy     |   N      |   ocean_rainfall  
+SNOW        |   kg m-2 s-1   |   xy     |   N      |   ocean_snowfall  
+PEN_OCN     |   W m-2        |   xy     |   N      |   penetrated_shortwave_flux_at_the_bottom_of_first_ocean_model_layer  

GEOSdatasea_GridComp/CMakeLists.txt

@@ -1,3 +1,7 @@
 esma_set_this ()
 
 esma_add_library (${this} SRCS GEOS_DataSeaGridComp.F90 DEPENDENCIES MAPL esmf NetCDF::NetCDF_Fortran)
+
+mapl_acg (${this}   GEOS_DataSea_StateSpecs.rc
+          IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
+          GET_POINTERS DECLARE_POINTERS)