Bug fix and add testing to demonstrate error

Author: dustinswales

scripts/ccpp_suite.py

@@ -426,15 +426,15 @@ def analyze(self, host_model, scheme_library, ddt_library, run_env):
         self.__ddt_library = ddt_library
         # Collect all relevant schemes
         # For all groups, find associated init and final methods
-        scheme_set = set()
+        scheme_set = list()
         for group in self.groups:
             for scheme in group.schemes():
-                scheme_set.add(scheme.name)
+                scheme_set.append(scheme.name)
             # end for
         # end for
         no_scheme_entries = {} # Skip schemes that are not in this suite
-        for module in scheme_library:
-            if module in scheme_set:
+        for module in scheme_set:
+            if scheme_library[module]:
                 scheme_entries = scheme_library[module]
             else:
                 scheme_entries = no_scheme_entries

test/var_compatibility_test/effr_calc.F90

@@ -8,10 +8,21 @@ module effr_calc
    implicit none
    private
 
-   public :: effr_calc_run
+   public :: effr_calc_run, effr_calc_init
 
-contains
+ contains
+   !> \section arg_table_effr_calc_init Argument Table
+   !! \htmlinclude arg_table_effr_calc_init.html
+   !!
+   subroutine effr_calc_init(errmsg, errflg)
+     character(len=512), intent(out)   :: errmsg
+     integer,            intent(out)   :: errflg
+     
+     errmsg = ''
+     errflg = 0
 
+   end subroutine effr_calc_init
+  
    !> \section arg_table_effr_calc_run  Argument Table
    !! \htmlinclude arg_table_effr_calc_run.html
    !!

test/var_compatibility_test/effr_calc.meta

@@ -2,6 +2,26 @@
   name = effr_calc
   type = scheme
   dependencies =
+########################################################################
+[ccpp-arg-table]
+  name = effr_calc_init
+  type = scheme
+[ errmsg ]
+  standard_name = ccpp_error_message
+  long_name = Error message for error handling in CCPP
+  units = none
+  dimensions = ()
+  type = character
+  kind = len=512
+  intent = out
+[ errflg ]
+  standard_name = ccpp_error_code
+  long_name = Error flag for error handling in CCPP
+  units = 1
+  dimensions = ()
+  type = integer
+  intent = out
+########################################################################
 [ccpp-arg-table]
   name = effr_calc_run
   type = scheme

test/var_compatibility_test/effr_diag.F90

@@ -8,10 +8,22 @@ module effr_diag
    implicit none
    private
 
-   public :: effr_diag_run
+   public :: effr_diag_run, effr_diag_init
 
 contains
 
+  !> \section arg_table_effr_diag_init Argument Table
+  !! \htmlinclude arg_table_effr_diag_init.html
+  !!
+  subroutine effr_diag_init(errmsg, errflg)
+    character(len=512), intent(out)   :: errmsg
+    integer,            intent(out)   :: errflg
+ 
+    errmsg = ''
+    errflg = 0
+
+  end subroutine effr_diag_init
+
    !> \section arg_table_effr_diag_run  Argument Table
    !! \htmlinclude arg_table_effr_diag_run.html
    !!

test/var_compatibility_test/effr_diag.meta

@@ -2,6 +2,26 @@
   name = effr_diag
   type = scheme
   dependencies =
+########################################################################
+[ccpp-arg-table]
+  name = effr_diag_init
+  type = scheme
+[ errmsg ]
+  standard_name = ccpp_error_message
+  long_name = Error message for error handling in CCPP
+  units = none
+  dimensions = ()
+  type = character
+  kind = len=512
+  intent = out
+[ errflg ]
+  standard_name = ccpp_error_code
+  long_name = Error flag for error handling in CCPP
+  units = 1
+  dimensions = ()
+  type = integer
+  intent = out
+########################################################################
 [ccpp-arg-table]
   name = effr_diag_run
   type = scheme

test/var_compatibility_test/effr_post.F90

@@ -8,10 +8,22 @@ module effr_post
    implicit none
    private
 
-   public :: effr_post_run
+   public :: effr_post_run, effr_post_init
 
 contains
 
+   !> \section arg_table_effr_post_init Argument Table
+   !! \htmlinclude arg_table_effr_post_init.html
+   !!
+   subroutine effr_post_init(errmsg, errflg)
+     character(len=512), intent(out)   :: errmsg
+     integer,            intent(out)   :: errflg
+
+     errmsg = ''
+     errflg = 0
+
+   end subroutine effr_post_init
+
    !> \section arg_table_effr_post_run  Argument Table
    !! \htmlinclude arg_table_effr_post_run.html
    !!

test/var_compatibility_test/effr_post.meta

@@ -2,6 +2,26 @@
   name = effr_post
   type = scheme
   dependencies =
+########################################################################
+[ccpp-arg-table]
+  name = effr_post_init
+  type = scheme
+[ errmsg ]
+  standard_name = ccpp_error_message
+  long_name = Error message for error handling in CCPP
+  units = none
+  dimensions = ()
+  type = character
+  kind = len=512
+  intent = out
+[ errflg ]
+  standard_name = ccpp_error_code
+  long_name = Error flag for error handling in CCPP
+  units = 1
+  dimensions = ()
+  type = integer
+  intent = out
+########################################################################
 [ccpp-arg-table]
   name = effr_post_run
   type = scheme

test/var_compatibility_test/effr_pre.F90

@@ -8,9 +8,20 @@ module effr_pre
    implicit none
    private
 
-   public :: effr_pre_run
+   public :: effr_pre_run, effr_pre_init
 
 contains
+   !> \section arg_table_effr_pre_init Argument Table
+   !! \htmlinclude arg_table_effr_pre_init.html
+   !!
+   subroutine effr_pre_init(errmsg, errflg)
+     character(len=512), intent(out)   :: errmsg
+     integer,            intent(out)   :: errflg
+
+     errmsg = ''
+     errflg = 0
+
+   end subroutine effr_pre_init
 
    !> \section arg_table_effr_pre_run  Argument Table
    !! \htmlinclude arg_table_effr_pre_run.html

test/var_compatibility_test/effr_pre.meta

@@ -2,6 +2,26 @@
   name = effr_pre
   type = scheme
   dependencies =
+########################################################################
+[ccpp-arg-table]
+  name = effr_pre_init
+  type = scheme
+[ errmsg ]
+  standard_name = ccpp_error_message
+  long_name = Error message for error handling in CCPP
+  units = none
+  dimensions = ()
+  type = character
+  kind = len=512
+  intent = out
+[ errflg ]
+  standard_name = ccpp_error_code
+  long_name = Error flag for error handling in CCPP
+  units = 1
+  dimensions = ()
+  type = integer
+  intent = out
+########################################################################
 [ccpp-arg-table]
   name = effr_pre_run
   type = scheme