Merge pull request #61 from GEOS-ESM/develop

sync main and develop

Author: mathomp4

.circleci/config.yml

@@ -1,11 +1,11 @@
 version: 2.1
 
 # Anchors to prevent forgetting to update a version
-#baselibs_version: &baselibs_version v7.14.0
+#baselibs_version: &baselibs_version v7.17.0
 #bcs_version: &bcs_version v11.3.0
 
 orbs:
-  ci: geos-esm/circleci-tools@1
+  ci: geos-esm/circleci-tools@2
 
 workflows:
   build-test:

GEOSdatasea_GridComp/CMakeLists.txt

@@ -5,3 +5,8 @@ esma_add_library (${this} SRCS GEOS_DataSeaGridComp.F90 DEPENDENCIES MAPL esmf N
 mapl_acg (${this}   GEOS_DataSea_StateSpecs.rc
           IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
           GET_POINTERS DECLARE_POINTERS)
+
+install (
+    FILES DataSea_ExtData.yaml
+    DESTINATION etc
+)

GEOSdatasea_GridComp/DataSea_ExtData.yaml

@@ -0,0 +1,5 @@
+Exports:
+    DATA_UW:
+        collection: /dev/null
+    DATA_VW:
+        collection: /dev/null

GEOSdatasea_GridComp/GEOS_DataSeaGridComp.F90

@@ -168,6 +168,8 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
   real, pointer, dimension(:,:)       :: TNEW   => null()
   real, pointer, dimension(:,:)       :: F1     => null()
 
+  real, parameter :: MAX_SPEED   = 10.0  ! maximum surface current speed, m s-1
+
 ! Pointers to imports and exports
 #include "GEOS_DataSea_DeclarePointer___.h"
 
@@ -255,8 +257,21 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
 !  Update the exports
 !--------------------
 
-   if(associated(UW)) UW = 0.0
-   if(associated(VW)) VW = 0.0
+   if (associated(UW)) then
+       where (abs(DATA_UW) < MAX_SPEED)
+           UW = DATA_UW
+       elsewhere
+           UW = 0.0
+       end where
+   end if
+
+   if (associated(VW)) then
+       where (abs(DATA_VW) < MAX_SPEED)
+           VW = DATA_VW
+       elsewhere
+           VW = 0.0
+       end where
+   end if
 
    TICE   = MAPL_TICE-1.8
 

GEOSdatasea_GridComp/GEOS_DataSea_StateSpecs.rc

@@ -10,6 +10,8 @@ category: IMPORT
  FRACICE        | 1       | xy          | N    |                     | fractional_cover_of_seaice
  DATA_SST       | K       | xy          | N    | ocean_extData       | sea_surface_temperature
  DATA_SSS       | PSU     | xy          | N    | ocean_sssData       | sea_surface_salinity
+ DATA_UW        | m s-1   | xy          | N    |                     | zonal_velocity_of_surface_water
+ DATA_VW        | m s-1   | xy          | N    |                     | meridional_velocity_of_surface_water
 
 category: EXPORT
 #----------------------------------------------------------------------------------------

MOM6_GEOSPlug/mom6_app/1440x1080/input.nml

@@ -1,6 +1,6 @@
  &MOM_input_nml
          output_directory = './',
-         input_filename = 'n'
+         input_filename = 'r'
          restart_input_dir = 'INPUT/',
          restart_output_dir = 'RESTART/',
          parameter_filename = 'MOM_input',

MOM6_GEOSPlug/mom6_app/540x458/MOM_override

@@ -60,3 +60,11 @@ TOPO_FILE = "ocean_topog.nc"
 !
 #override USE_HORIZONTAL_BOUNDARY_DIFFUSION = True
 #override LBD_LINEAR_TRANSITION = True
+!
+! Extra slack for bad values
+!
+#override BAD_VAL_SSH_MAX = 50.0 
+#override BAD_VAL_SSS_MAX = 75.0
+#override BAD_VAL_SST_MAX = 55.0
+#override BAD_VAL_SST_MIN = -3.0
+

MOM6_GEOSPlug/mom6_app/540x458/input.nml

@@ -1,6 +1,6 @@
  &MOM_input_nml
          output_directory = './',
-         input_filename = 'n'
+         input_filename = 'r'
          restart_input_dir = 'INPUT/',
          restart_output_dir = 'RESTART/',
          parameter_filename = 'MOM_input',

MOM6_GEOSPlug/mom6_app/72x36/input.nml

@@ -1,6 +1,6 @@
  &MOM_input_nml
          output_directory = './',
-         input_filename = 'n'
+         input_filename = 'r'
          restart_input_dir = 'INPUT/',
          restart_output_dir = 'RESTART/',
          parameter_filename = 'MOM_input',