updating gftl

CMakeLists.txt

@@ -104,7 +104,7 @@ if (BUILD_GEOS_GTFV3_INTERFACE)
 
 endif ()
 
-set(dependencies MAPL GFTL_SHARED::gftl-shared GMAO_hermes GEOS_Shared esmf OpenMP::OpenMP_Fortran)
+set(dependencies MAPL GFTL_SHARED::gftl-shared-v2 GMAO_hermes GEOS_Shared esmf OpenMP::OpenMP_Fortran)
 
 if (BUILD_GEOS_GTFV3_INTERFACE)
   esma_add_library (${this}

fv_regrid_c2c.F90

@@ -15,8 +15,8 @@ module fv_regrid_c2c
    use field_manager_mod,  only: MODEL_ATMOS
 
    use MAPL
-   use gFTL_StringVector
-   use gFTL_StringIntegerMap
+   use gFTL2_StringVector
+   use gFTL2_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
@@ -447,7 +447,7 @@ subroutine get_geos_cubed_ic( Atm, extra_rst, gridOut )
             siter = all_moist_vars%begin()
             Variables => cfg(1)%get_variables()
             do while(siter /= all_moist_vars%end())
-               var_name => siter%get()
+               var_name => siter%of()
                myVariable => variables%at(var_name)
                var_dimensions => myVariable%get_dimensions()
                ndims = var_dimensions%size()
@@ -584,8 +584,8 @@ subroutine get_geos_cubed_ic( Atm, extra_rst, gridOut )
 
       iter = moist_tracers%begin()
       do while (iter /= moist_tracers%end())
-         iptr => iter%value()
-         cptr => iter%key()
+         iptr => iter%second()
+         cptr => iter%first()
          if (.not.match(cptr)) then 
             do k=1,npz
                do j=js,je

fv_regrid_c2c_bin.F90

@@ -14,8 +14,7 @@ module fv_regrid_c2c_bin
    use field_manager_mod,  only: MODEL_ATMOS
 
    use MAPL
-   use gFTL_StringVector
-   use gFTL_StringIntegerMap
+   use gFTL2_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
@@ -489,8 +488,8 @@ subroutine get_geos_cubed_ic( Atm, extra_rst, gridOut )
 
       iter = moist_tracers%begin()
       do while (iter /= moist_tracers%end())
-         iptr => iter%value()
-         cptr => iter%key()
+         iptr => iter%second()
+         cptr => iter%first()
          if (.not.match(cptr)) then 
             do k=1,npz
                do j=js,je

interp_restarts.F90

@@ -23,8 +23,8 @@ program interp_restarts
    use memutils_mod, only: print_memuse_stats
    use MAPL
    use pflogger, only: pfl_initialize => initialize
-   use gFTL_StringVector
-   use gFTL_StringIntegerMap
+   use gFTL2_StringVector
+   use gFTL2_StringIntegerMap
    use rs_scaleMod
 
    implicit none
@@ -244,7 +244,7 @@ program interp_restarts
       variables => InCfg(1)%get_variables()
       lcnt_var=2
       do while (siter /= all_moist_vars%end())
-         var_name => siter%get()
+         var_name => siter%of()
          myVariable => variables%at(var_name)
          var_dimensions => myVariable%get_dimensions()
          ndims = var_dimensions%size()
@@ -565,7 +565,7 @@ program interp_restarts
       ivar=0
       do while (siter /= all_moist_vars%end())
          ivar=ivar+1
-         var_name => siter%get()
+         var_name => siter%of()
          myVariable => variables%at(var_name)
          var_dimensions => myVariable%get_dimensions()
          ndims = var_dimensions%size()

interp_restarts_bin.F90

@@ -23,8 +23,7 @@ program interp_restarts
    use memutils_mod, only: print_memuse_stats
    use MAPL
    use pflogger, only: pfl_initialize => initialize
-   use gFTL_StringVector
-   use gFTL_StringIntegerMap
+   use gFTL2_StringIntegerMap
    use rs_scaleMod
 
    implicit none

rs_scaleMod.F90

@@ -3,7 +3,7 @@ module rs_scaleMod
 
    use fv_arrays_mod
    use MAPL
-   use gFTL_StringIntegerMap
+   use gFTL2_StringIntegerMap
    use ESMF
    use, intrinsic :: iso_fortran_env, only: REAL64, REAL32 
    ! bma added