Remove depth from the export scpecs

GEOS-ESM · Jan 5, 2024 · 5edf8a1 · 5edf8a1
1 parent d6e0b9f
commit 5edf8a1
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 41 deletions.
diff --git a/GEOS_OceanGridComp.F90 b/GEOS_OceanGridComp.F90
@@ -165,7 +165,6 @@ subroutine SetServices ( GC, RC )
     call MAPL_AddExportSpec (GC, SHORT_NAME = 'SW', CHILD_ID = OCN,  _RC)
     call MAPL_AddExportSpec (GC, SHORT_NAME = 'UW', CHILD_ID = OCN,  _RC)
     call MAPL_AddExportSpec (GC, SHORT_NAME = 'VW', CHILD_ID = OCN,  _RC)
-    call MAPL_AddExportSpec (GC, SHORT_NAME = 'DW', CHILD_ID = OCN,  _RC)
 
     if(DO_DATASEA==0) then
        call MAPL_AddExportSpec (GC, SHORT_NAME = 'DH',  CHILD_ID = OCN, _RC)

diff --git a/GEOSdatasea_GridComp/DataSea_ExtData.yaml b/GEOSdatasea_GridComp/DataSea_ExtData.yaml
@@ -3,31 +3,3 @@ Exports:
         collection: /dev/null
     DATA_VW:
         collection: /dev/null
-    DATA_DW:
-        collection: /dev/null
-        linear_transformation: [-3682.0, 0.0]
-
-# --
-#
-# Comment:
-#    configuration: GEOS/WGCM
-#    description: realistic currents and ocean depth
-#
-# Samplings:
-#    static:
-#    extrapolation: persist_closest
-#
-# Collections:
-#     gebco_terrain_model_for_ocean_and_land:
-#         template: /discover/nobackup/projects/gmao/geos-wmma/data/gebco2008.ocean_depth.nc4
-#     s2s_ana_ocean:
-#         template: /discover/nobackup/projects/gmao/geos-wmma/data/S2S-2_1_ANA_001/S2S-2_1_ANA_001.geosgcm_ocn2d_720x361.%y4%m2%d2_1200z.nc4
-#
-# Exports:
-#     DATA_UW;DATA_VW:
-#         collection: /dev/null
-#         variable: none;none
-# DATA_DW:
-#     collection: gebco_terrain_model_for_ocean_and_land
-#     sample: static
-#     variable: elevation
diff --git a/GEOSdatasea_GridComp/GEOS_DataSeaGridComp.F90 b/GEOSdatasea_GridComp/GEOS_DataSeaGridComp.F90
@@ -168,8 +168,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
   real, pointer, dimension(:,:)       :: TNEW   => null()
   real, pointer, dimension(:,:)       :: F1     => null()
 
-  real, parameter :: MAX_SPEED   = 1e1   ! maximum surface current speed, m s-1
-  real, parameter :: MAX_TERRAIN = 12e3  ! maximum elevation/depth, m
+  real, parameter :: MAX_SPEED   = 10.0  ! maximum surface current speed, m s-1
 
 ! Pointers to imports and exports
 #include "GEOS_DataSea_DeclarePointer___.h"
@@ -274,14 +273,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
        end where
    end if
 
-   if (associated(DW)) then
-       where (abs(DATA_DW) < MAX_TERRAIN)
-           DW = DATA_DW
-       elsewhere
-           DW = 0.0
-       end where
-   end if
-
    TICE   = MAPL_TICE-1.8
 
    if (adjSST == 1) then

diff --git a/GEOSdatasea_GridComp/GEOS_DataSea_StateSpecs.rc b/GEOSdatasea_GridComp/GEOS_DataSea_StateSpecs.rc
@@ -12,7 +12,6 @@ category: IMPORT
  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
- DATA_DW        | m       | xy          | N    |                     | sea_floor_depth
 
 category: EXPORT
 #----------------------------------------------------------------------------------------
@@ -22,7 +21,6 @@ category: EXPORT
 #----------------------------------------------------------------------------------------
  UW             | m s-1   | xy          | N           | zonal_velocity_of_surface_water
  VW             | m s-1   | xy          | N           | meridional_velocity_of_surface_water
- DW             | m       | xy          | N           | sea_floor_depth
  TW             | K       | xy          | N           | foundation_temperature_for_interface_layer
  SW             | PSU     | xy          | N           | foundation_salinity_for_interface_layer