Merge pull request NOAA-GFDL#22 from GEOS-ESM/feature/tclune/NOAA-GFD…

…L#21-use-gftl-shared Fixes NOAA-GFDL#21 - use gFTL-shared.
climbfuji · Dec 5, 2019 · aa5b7c5 · aa5b7c5
2 parents b29abe5 + 41ecfb4
commit aa5b7c5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,7 +56,7 @@ endif ()
 
 esma_add_library (${this}
   SRCS ${srcs}
-  DEPENDENCIES MAPL 
+  DEPENDENCIES MAPL gftl-shared
   INCLUDES ${extra_incs} ${INC_ESMF} ${INC_NETCDF})
 
 if (FV_PRECISION STREQUAL R4)

diff --git a/geos_utils/fv_regrid_c2c.F90 b/geos_utils/fv_regrid_c2c.F90
@@ -14,6 +14,8 @@ module fv_regrid_c2c
    use field_manager_mod,  only: MODEL_ATMOS
 
    use MAPL
+   use gFTL_StringVector
+   use gFTL_StringIntegerMap
    use, intrinsic :: iso_fortran_env, only: REAL64, REAL32
 
    use fv_arrays_mod,     only: fv_atmos_type, fv_grid_type, fv_grid_bounds_type, FVPRC, REAL4, REAL8

diff --git a/geos_utils/rs_scaleMod.F90 b/geos_utils/rs_scaleMod.F90
@@ -3,6 +3,7 @@ module rs_scaleMod
 
    use fv_arrays_mod
    use MAPL
+   use gFTL_StringIntegerMap
    use ESMF
    use, intrinsic :: iso_fortran_env, only: REAL64, REAL32 
    ! bma added

diff --git a/tools/external_ic.F90 b/tools/external_ic.F90
@@ -483,7 +483,6 @@ subroutine get_geos_cubed_ic( Atm, fv_domain, nq, ntracers )
       logical            :: isNC4
       type(Netcdf4_Fileformatter) :: formatter
       type(FileMetadata), allocatable :: cfg(:)
-      type(StringIntegerMap) :: dims
       integer            :: nDims, nVars, ivar, dimSizes(3)
       character(len=128) :: vname
       real(FVPRC),   allocatable  :: gslice_r4(:,:)