Bug fix and exercise change in testing.

scripts/metavar.py

@@ -1677,12 +1677,37 @@ def add_variable(self, newvar, run_env, exists_ok=False, gen_unique=False,
                                        context=newvar.context)
             # end if
         # end if
+        # Check if local_name exists in Group. If applicable, Create new 
+        # variable with uniquie name. There are two instances when new names are
+        # created:
+        # - Same <local_name> used in different DDTs.
+        # - Different <standard_name> using the same <local_name> in a Group.
+        #   During the Group analyze phase, <gen_unique> is True.
         lname = newvar.get_prop_value('local_name')
         lvar = self.find_local_name(lname)
         if lvar is not None:
+            # Check if <lvar> is part of a different DDT than <newvar>.
+            # The API uses the full variable references when calling the Group Caps,
+            # <lvar.call_string(self))> and <newvar.call_string(self)>.
+            # Within the context of a full reference, it is allowable for local_names
+            # to be the same in different data containers.
+            newvar_callstr = newvar.call_string(self)
+            lvar_callstr   = lvar.call_string(self)
+            if newvar_callstr and lvar_callstr:
+                if newvar_callstr != lvar_callstr:
+                    if not gen_unique:
+                        exists_ok = True
+                    # end if
+                # end if
+            # end if
             if gen_unique:
                 new_lname = self.new_internal_variable_name(prefix=lname)
                 newvar = newvar.clone(new_lname)
+                # Local_name needs to be the local_name for the new
+                # internal variable, otherwise multiple instances of the same
+                # local_name in the Group cap will all be overwritten with the
+                # same local_name
+                lname = new_lname
             elif not exists_ok:
                 errstr = 'Invalid local_name: {} already registered{}'
                 cstr = context_string(lvar.source.context, with_comma=True)

test/var_compatibility_test/effr_diag.F90

@@ -27,9 +27,10 @@ end subroutine effr_diag_init
    !> \section arg_table_effr_diag_run  Argument Table
    !! \htmlinclude arg_table_effr_diag_run.html
    !!
-   subroutine effr_diag_run( effrr_in,  errmsg, errflg)
+   subroutine effr_diag_run( effrr_in,  scalar_var, errmsg, errflg)
 
       real(kind_phys),    intent(in)    :: effrr_in(:,:)
+      real(kind_phys),    intent(in)    :: scalar_var
       character(len=512), intent(out)   :: errmsg
       integer,            intent(out)   :: errflg
       !----------------------------------------------------------------

test/var_compatibility_test/effr_diag.meta

@@ -34,6 +34,14 @@
   kind = kind_phys
   intent = in
   top_at_one = True
+[ scalar_var ]
+  standard_name = scalar_variable_for_testing_c
+  long_name = unused scalar variable C
+  units = m
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
 [ errmsg ]
   standard_name = ccpp_error_message
   long_name = Error message for error handling in CCPP

test/var_compatibility_test/effr_post.F90

@@ -27,9 +27,10 @@ end subroutine effr_post_init
    !> \section arg_table_effr_post_run  Argument Table
    !! \htmlinclude arg_table_effr_post_run.html
    !!
-   subroutine effr_post_run( effrr_inout,  errmsg, errflg)
+   subroutine effr_post_run( effrr_inout,  scalar_var, errmsg, errflg)
 
       real(kind_phys),    intent(inout) :: effrr_inout(:,:)
+      real(kind_phys),    intent(in)    :: scalar_var
       character(len=512), intent(out)   :: errmsg
       integer,            intent(out)   :: errflg
       !----------------------------------------------------------------

test/var_compatibility_test/effr_post.meta

@@ -33,6 +33,14 @@
   type = real
   kind = kind_phys
   intent = inout
+[ scalar_var ]
+  standard_name = scalar_variable_for_testing_b
+  long_name = unused scalar variable B
+  units = m
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
 [ errmsg ]
   standard_name = ccpp_error_message
   long_name = Error message for error handling in CCPP

test/var_compatibility_test/effr_pre.F90

@@ -26,9 +26,10 @@ end subroutine effr_pre_init
    !> \section arg_table_effr_pre_run  Argument Table
    !! \htmlinclude arg_table_effr_pre_run.html
    !!
-   subroutine effr_pre_run( effrr_inout,  errmsg, errflg)
+   subroutine effr_pre_run( effrr_inout, scalar_var,  errmsg, errflg)
 
       real(kind_phys),    intent(inout) :: effrr_inout(:,:)
+      real(kind_phys),    intent(in)    :: scalar_var
       character(len=512), intent(out)   :: errmsg
       integer,            intent(out)   :: errflg
       !----------------------------------------------------------------

test/var_compatibility_test/effr_pre.meta

@@ -33,6 +33,14 @@
   type = real
   kind = kind_phys
   intent = inout
+[ scalar_var ]
+  standard_name = scalar_variable_for_testing_a
+  long_name = unused scalar variable A
+  units = m
+  dimensions = ()
+  type = real
+  kind = kind_phys
+  intent = in
 [ errmsg ]
   standard_name = ccpp_error_message
   long_name = Error message for error handling in CCPP

test/var_compatibility_test/test_host.F90

@@ -351,13 +351,16 @@ program test
 
    character(len=cs), target :: test_parts1(1) = (/ 'radiation       ' /)
 
-   character(len=cm), target :: test_invars1(8) = (/                          &
+   character(len=cm), target :: test_invars1(11) = (/                         &
         'effective_radius_of_stratiform_cloud_rain_particle        ',         &
         'effective_radius_of_stratiform_cloud_liquid_water_particle',         &
         'effective_radius_of_stratiform_cloud_snow_particle        ',         &
         'effective_radius_of_stratiform_cloud_graupel              ',         &
         'cloud_graupel_number_concentration                        ',         &
         'scalar_variable_for_testing                               ',         &
+        'scalar_variable_for_testing_a                             ',         &
+        'scalar_variable_for_testing_b                             ',         &
+        'scalar_variable_for_testing_c                             ',         &
         'flag_indicating_cloud_microphysics_has_graupel            ',         &
         'flag_indicating_cloud_microphysics_has_ice                '/)
 
@@ -371,7 +374,7 @@ program test
         'cloud_ice_number_concentration                            ',         &
         'scalar_variable_for_testing                               ' /)
 
-   character(len=cm), target :: test_reqvars1(12) = (/                        &
+   character(len=cm), target :: test_reqvars1(15) = (/                        &
         'ccpp_error_code                                           ',         &
         'ccpp_error_message                                        ',         &
         'effective_radius_of_stratiform_cloud_rain_particle        ',         &
@@ -382,6 +385,9 @@ program test
         'cloud_graupel_number_concentration                        ',         &
         'cloud_ice_number_concentration                            ',         &
         'scalar_variable_for_testing                               ',         &
+        'scalar_variable_for_testing_a                             ',         &
+        'scalar_variable_for_testing_b                             ',         &
+        'scalar_variable_for_testing_c                             ',         &
         'flag_indicating_cloud_microphysics_has_graupel            ',         &
         'flag_indicating_cloud_microphysics_has_ice                '/)
 

test/var_compatibility_test/test_host_data.F90

@@ -13,6 +13,9 @@ module test_host_data
           ncg,                                       & ! number concentration of cloud graupel
           nci                                          ! number concentration of cloud ice
      real(kind_phys) :: scalar_var
+     real(kind_phys) :: scalar_varA
+     real(kind_phys) :: scalar_varB
+     real(kind_phys) :: scalar_varC
   end type physics_state
 
   public allocate_physics_state

test/var_compatibility_test/test_host_data.meta

@@ -59,3 +59,24 @@
   dimensions = ()
   type = real
   kind = kind_phys
+[scalar_varA]
+  standard_name = scalar_variable_for_testing_a
+  long_name = unused scalar variable A
+  units = m
+  dimensions = ()
+  type = real
+  kind = kind_phys
+[scalar_varB]
+  standard_name = scalar_variable_for_testing_b
+  long_name = unused scalar variable B
+  units = m
+  dimensions = ()
+  type = real
+  kind = kind_phys
+[scalar_varC]
+  standard_name = scalar_variable_for_testing_c
+  long_name = unused scalar variable C
+  units = m
+  dimensions = ()
+  type = real
+  kind = kind_phys

test/var_compatibility_test/test_reports.py

@@ -74,6 +74,9 @@ def usage(errmsg=None):
                           "effective_radius_of_stratiform_cloud_graupel",
                           "cloud_graupel_number_concentration",
                           "scalar_variable_for_testing",
+                          "scalar_variable_for_testing_a",
+                          "scalar_variable_for_testing_b",
+                          "scalar_variable_for_testing_c",
                           "flag_indicating_cloud_microphysics_has_graupel",
                           "flag_indicating_cloud_microphysics_has_ice"]
 _OUTPUT_VARS_VAR_ACTION = ["ccpp_error_code", "ccpp_error_message",