Merge pull request #117 from GEOS-ESM/develop

Merge Develop into main
GEOS-ESM · May 25, 2021 · 1a16783 · 1a16783
2 parents debfea8 + a3f06a8
commit 1a16783
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/StandAlone_AdvCore.F90 b/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)
 

diff --git a/StandAlone_DynAdvCore.F90 b/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)
 

diff --git a/StandAlone_FV3_Dycore.F90 b/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)