Feature/#4259 2nd attempt (#4263)

* Fixes #4259 - eliminating some legacy portions of MAPL

Previous attempt was too aggressive.  Now only deleting a few high
level gridcomps.

* Trivial update to trigger CI

* Fix up link checker

* Add mapl3 to MAPL.F90 (module MAPL)

* Add mapl3g as dependency for MAPL

* Add missing private

* Fix some missing use

* Don't run tutorials in CircleCI

* move to gftl v2

* use renames to support both MAPL and mapl3 modules

* Fix for NAG

* One more item to mask.

* oops

* Fixes #4259.

A small PR is required on GCM to build with this, and then can merge.

* Update CHANGELOG.md

Making trivial change to trigger CI.

---------

Co-authored-by: Matthew Thompson <matthew.thompson@nasa.gov>

Author: tclune

.circleci/config.yml

@@ -41,27 +41,31 @@ workflows:
           mepodevelop: false
           run_unit_tests: true
           ctest_options: "-L 'ESSENTIAL' --output-on-failure"
-          persist_workspace: true # Needed for MAPL tutorials
+          persist_workspace: false # Needed for MAPL tutorials
 
-      # Run MAPL Tutorials
-      - ci/run_mapl_tutorial:
-          name: run-<< matrix.tutorial_name >>-Tutorial-with-<< matrix.compiler >>-built-with-<< matrix.build_type >>
-          context:
-            - docker-hub-creds
-          matrix:
-            parameters:
-              compiler: [ifort]
-              build_type: ['Debug']
-              tutorial_name:
-                - hello_world
-                - parent_no_children
-                - parent_one_child_import_via_extdata
-                - parent_one_child_no_imports
-                - parent_two_siblings_connect_import_export
-          # We will only run the tutorials with GNU make. No need to double up as Ninja is a build test only
-          requires:
-            - build-and-test-MAPL-as-<< matrix.build_type >>-on-<< matrix.compiler >>-using-Unix Makefiles
-          baselibs_version: *baselibs_version
+      # Tutorials have been removed (for now) from MAPL3
+      # NOTE: When we restore tutorials, change persist_workspace to true above!!!
+      ###################################################################################################################
+      # # Run MAPL Tutorials                                                                                            #
+      # - ci/run_mapl_tutorial:                                                                                         #
+      #     name: run-<< matrix.tutorial_name >>-Tutorial-with-<< matrix.compiler >>-built-with-<< matrix.build_type >> #
+      #     context:                                                                                                    #
+      #       - docker-hub-creds                                                                                        #
+      #     matrix:                                                                                                     #
+      #       parameters:                                                                                               #
+      #         compiler: [ifort]                                                                                       #
+      #         build_type: ['Debug']                                                                                   #
+      #         tutorial_name:                                                                                          #
+      #           - hello_world                                                                                         #
+      #           - parent_no_children                                                                                  #
+      #           - parent_one_child_import_via_extdata                                                                 #
+      #           - parent_one_child_no_imports                                                                         #
+      #           - parent_two_siblings_connect_import_export                                                           #
+      #     # We will only run the tutorials with GNU make. No need to double up as Ninja is a build test only          #
+      #     requires:                                                                                                   #
+      #       - build-and-test-MAPL-as-<< matrix.build_type >>-on-<< matrix.compiler >>-using-Unix Makefiles            #
+      #     baselibs_version: *baselibs_version                                                                         #
+      ###################################################################################################################
 
       # Builds MAPL without pFlogger and fargparse and pFUnit
       - ci/build:

Apps/CMakeLists.txt

@@ -37,10 +37,6 @@ ecbuild_add_executable (TARGET time_ave_util.x SOURCES time_ave_util.F90)
 target_link_libraries (time_ave_util.x PRIVATE MAPL MPI::MPI_Fortran ESMF::ESMF OpenMP::OpenMP_Fortran)
 target_include_directories (time_ave_util.x PRIVATE $<BUILD_INTERFACE:${MAPL_SOURCE_DIR}/include>)
 
-ecbuild_add_executable (TARGET Comp_Testing_Driver.x SOURCES Component_Testing/Comp_Testing_Driver.F90)
-target_link_libraries (Comp_Testing_Driver.x PRIVATE MAPL MPI::MPI_Fortran ESMF::ESMF OpenMP::OpenMP_Fortran)
-target_include_directories (Comp_Testing_Driver.x PRIVATE $<BUILD_INTERFACE:${MAPL_SOURCE_DIR}/include>)
-
 if (PFUNIT_FOUND)
   add_subdirectory(tests EXCLUDE_FROM_ALL)
 endif ()

Apps/Component_Testing/Comp_Testing_Driver.F90

@@ -4,7 +4,7 @@ module regrid_util_support_mod
 
    use ESMF
    use MAPL
-   use gFTL_StringVector
+   use gFTL2_StringVector
 
    implicit NONE
 
@@ -332,7 +332,7 @@ Program Regrid_Util
    use MAPL_ESMFFieldBundleRead
    use MAPL_ServerManager
    use MAPL_FileMetadataUtilsMod
-   use gFTL_StringVector
+   use gFTL2_StringVector
    use regrid_util_support_mod
    use mpi
 

Apps/Component_Testing/README.md

@@ -1,4 +1,4 @@
-# Changelog
+# Changelog 
 
 All notable changes to this project will be documented in this file.
 
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
-- Removes backward compatibility for MAPL_FargparseCLI functions. Only accepts function usage in which the result is of
+- Removes backward compatibility for `MAPL_FargparseCLI` functions. Only accepts function usage in which the result is of
   MAPL_CapOptions type.
 - Remove FLAP support.
 - Remove `BUILD_SHARED_MAPL` CMake option. MAPL3 is now always built as a shared library.

Apps/Regrid_Util/Regrid_Util.F90

@@ -3,7 +3,7 @@ esma_set_this()
 
 esma_add_library (${this}
   SRCS MAPL.F90
-  DEPENDENCIES MAPL.base MAPL.generic MAPL.pfio MAPL_cfio_r4 MAPL.gridcomps MAPL.orbit MAPL.griddedio MAPL.field ${EXTDATA_TARGET}
+  DEPENDENCIES mapl3g MAPL.base MAPL.generic MAPL.pfio MAPL_cfio_r4 MAPL.gridcomps MAPL.orbit MAPL.griddedio MAPL.field ${EXTDATA_TARGET}
                ESMF::ESMF NetCDF::NetCDF_Fortran MPI::MPI_Fortran
   TYPE SHARED
   )

CHANGELOG.md

@@ -14,7 +14,7 @@ module MAPL
    use MAPL_OpenMP_Support, only : MAPL_get_num_threads => get_num_threads
    use MAPL_OpenMP_Support, only : MAPL_find_bounds => find_bounds
    use MAPL_OpenMP_Support, only : MAPL_Interval => Interval
-   use MAPL_Profiler, initialize_profiler =>initialize, finalize_profiler =>finalize
+   use MAPL_Profiler, initialize_profiler => initialize, finalize_profiler => finalize
    use MAPL_FieldUtils
    use MAPL_StateUtils
    implicit none
@@ -23,4 +23,4 @@ end module MAPL
 module MAPL_Mod
    use MAPL
 end module MAPL_Mod
-   
+