Merge branch 'develop' into feature/mathomp4/add-openmp-support

Author: mathomp4

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 executors:
   gcc-build-env:
     docker:
-      - image: gmao/ubuntu20-geos-env-mkl:v6.1.0-openmpi_4.0.5-gcc_10.2.0
+      - image: gmao/ubuntu20-geos-env-mkl:v6.2.4-openmpi_4.0.5-gcc_10.3.0
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_AUTH_TOKEN

.gitignore

@@ -1,2 +1,4 @@
 *~
 /@fvdycore
+/fvdycore
+/fvdycore@

StandAlone_AdvCore.F90

@@ -16,13 +16,15 @@ program StandAlone_AdvCore
    character(*), parameter :: IAM = __FILE__
 
    type (MAPL_Cap) :: cap
-   type (MAPL_FlapCapOptions) :: cap_options
+   type (MAPL_FlapCLI) :: cli
+   type (MAPL_CapOptions) :: cap_options
    integer :: status
 
-   cap_options = MAPL_FlapCapOptions( &
+   cli = MAPL_FlapCLI( &
         description = 'FV Standalone dvCore', &
         authors     = 'S.J. Lin, R. Rood, W. Putman')
 
+   cap_options = MAPL_CapOptions(cli)
    cap = MAPL_Cap('Standalone FV3 AdvCore', SetServices, cap_options=cap_options)
    call cap%run(_RC)
 

StandAlone_DynAdvCore.F90

@@ -16,13 +16,14 @@ program StandAlone_DynAdvCore
    character(*), parameter :: IAM = __FILE__
 
    type (MAPL_Cap) :: cap
-   type (MAPL_FlapCapOptions) :: cap_options
+   type (MAPL_FlapCLI) :: cli
+   type (MAPL_CapOptions) :: cap_options
    integer :: status
 
-   cap_options = MAPL_FlapCapOptions( &
+   cli = MAPL_FlapCLI( &
         description = 'FV Standalone DyAdvCore', &
         authors     = 'S.J. Lin, R. Rood, W. Putman')
-
+   cap_options = MAPL_CapOptions(cli)
    cap = MAPL_Cap('Standalone FV3 DynAdvCore', SetServices, cap_options = cap_options)
    call cap%run(_RC)
 

StandAlone_FV3_Dycore.F90

@@ -15,11 +15,13 @@ program StandAlone_FV3_Dycore
    character(*), parameter :: IAM = __FILE__
 
    type (MAPL_Cap) :: cap
-   type (MAPL_FlapCapOptions), allocatable :: cap_options
+   type (MAPL_FlapCLI) :: cli
+   type (MAPL_CapOptions) :: cap_options
    integer :: status
 
-   cap_options = MAPL_FlapCapOptions(description = 'FV Standalone Dycore',&
-                                     authors      =  'S.J. Lin, R. Rood, W. Putman')
+   cli = MAPL_FlapCLI(description = 'FV Standalone Dycore',&
+                              authors      =  'S.J. Lin, R. Rood, W. Putman')
+   cap_options = MAPL_CapOptions(cli)
    cap = MAPL_Cap('GCM', SetServices, cap_options = cap_options)
    call cap%run(_RC)