Merge two workarounds in scripts/ccpp_prebuild.py and scripts/mkcap.p…

…y due to ccpp-physics not being updated at the same time as ccpp-framework (optional argument changes are missing)
NCAR · Dec 9, 2024 · f9bc040 · f9bc040
1 parent 27d0486
commit f9bc040
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/scripts/ccpp_prebuild.py b/scripts/ccpp_prebuild.py
@@ -490,9 +490,12 @@ def compare_metadata(metadata_define, metadata_request):
         if not metadata_define[var_name][0].active == 'T':
             for var in metadata_request[var_name]:
                 if var.optional == 'F':
-                    logging.error("Conditionally allocated host-model variable {0} is not optional in {1}".format(
+                    # DH 20241022 - change logging.error to logging.warn, because it is known
+                    # that this strict check is not correct and will be reverted soon
+                    #logging.error(
+                    logging.warn("Conditionally allocated host-model variable {0} is not optional in {1}".format(
                                   var_name, var.container))
-                    success = False
+                    #success = False
         # TEMPORARY CHECK - IF THE VARIABLE IS ALWAYS ALLOCATED, THE SCHEME VARIABLE SHOULDN'T BE OPTIONAL
         else:
             for var in metadata_request[var_name]:

diff --git a/scripts/mkcap.py b/scripts/mkcap.py
@@ -355,12 +355,16 @@ def print_def_local(self, metadata):
                         str = "type({s.type}), pointer :: p => null()"
             return str.format(s=self)
         else:
-            # If the host variable is potentially unallocated, the active attribute is
-            # also set accordingly for the local variable; add target to variable declaration
-            if self.optional == 'T':
-                target = ', target'
-            else:
-                target = ''
+            # DH* 20241022 WORKAROUND TO ACCOUNT FOR MISSING UPDATES TO CCPP PHYSICS
+            # W.R.T. DECLARING OPTIONAL VARIABLES IN METADATA AND CODE. ALWAYS USE TARGET
+            ## If the host variable is potentially unallocated, the active attribute is
+            ## also set accordingly for the local variable; add target to variable declaration
+            #if self.optional == 'T':
+            #    target = ', target'
+            #else:
+            #    target = ''
+            target = ', target'
+            # *DH
             if self.type in STANDARD_VARIABLE_TYPES:
                 if self.kind:
                     if self.rank: