diff --git a/src/data/write_init_files.py b/src/data/write_init_files.py index 17e1e8e4a..838c5f1b0 100644 --- a/src/data/write_init_files.py +++ b/src/data/write_init_files.py @@ -1099,7 +1099,7 @@ def write_phys_read_subroutine(outfile, host_dict, host_vars, host_imports, # Handle the case where the required variable is a constituent outfile.write("case (const_idx)", 5) outfile.blank_line() - outfile.comment("If an index was found in the constituent hash table, then do nothing, this will be handled later", 6) + outfile.comment("If an index was found in the constituent hash table, then do nothing, this will be handled later.", 6) outfile.blank_line() # start default case steps: @@ -1412,7 +1412,13 @@ def write_phys_check_subroutine(outfile, host_dict, host_vars, host_imports, # Skip constituent variables: outfile.write("case (const_idx)", 5) outfile.blank_line() - outfile.comment("If variable is a constituent, then do nothing. We'll handle these later", 6) + outfile.comment("If variable is a constituent, then do nothing. We'll handle these later.", 6) + outfile.blank_line() + + # Skip already initialized variables: + outfile.write("case (init_mark_idx)", 5) + outfile.blank_line() + outfile.comment("If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. There is nothing we can check against.", 6) outfile.blank_line() # Generate error message if required variable isn't found: diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_4D.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_4D.F90 index 0cde34503..d3326cfc4 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_4D.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_4D.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -317,7 +317,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_bvd.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_bvd.F90 index 277616dbf..4d5020972 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_bvd.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_bvd.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -317,7 +317,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_cnst.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_cnst.F90 index 5774861bf..836b44d1c 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_cnst.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_cnst.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -317,7 +317,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_constituent_dim.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_constituent_dim.F90 index 417e02dec..599148b16 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_constituent_dim.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_constituent_dim.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -325,7 +325,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt.F90 index 72718c91d..c1820be82 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -317,7 +317,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90 index 73407ccad..72727daf3 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt2.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -317,7 +317,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90 index f03012115..1e66b2f29 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_ddt_array.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -317,7 +317,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_host_var.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_host_var.F90 index a55d982cf..ec1ca6a0b 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_host_var.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_host_var.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -313,7 +313,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_initial_value.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_initial_value.F90 index 406bbc736..2a460d699 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_initial_value.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_initial_value.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -317,7 +317,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_mf.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_mf.F90 index 300628060..8fc4f7d49 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_mf.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_mf.F90 @@ -140,7 +140,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -318,7 +318,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_no_horiz.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_no_horiz.F90 index 35e5260f2..a44bd1f77 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_no_horiz.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_no_horiz.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -317,7 +317,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_noreq.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_noreq.F90 index 978046720..6f64e83e5 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_noreq.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_noreq.F90 @@ -138,7 +138,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -309,7 +309,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_param.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_param.F90 index 2d3ffbe52..3ea2ff058 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_param.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_param.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -320,7 +320,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_protect.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_protect.F90 index e7c899f0e..917d2031f 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_protect.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_protect.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -317,7 +317,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_scalar.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_scalar.F90 index 28b64a837..575e87fbd 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_scalar.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_scalar.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -317,7 +317,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx) diff --git a/test/unit/python/sample_files/write_init_files/physics_inputs_simple.F90 b/test/unit/python/sample_files/write_init_files/physics_inputs_simple.F90 index fb07ef005..1d798e7b4 100644 --- a/test/unit/python/sample_files/write_init_files/physics_inputs_simple.F90 +++ b/test/unit/python/sample_files/write_init_files/physics_inputs_simple.F90 @@ -139,7 +139,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia case (const_idx) - ! If an index was found in the constituent hash table, then do nothing, this will be handled later + ! If an index was found in the constituent hash table, then do nothing, this will be handled later. case default @@ -317,7 +317,12 @@ subroutine physics_check_data(file_name, suite_names, timestep, min_difference, case (const_idx) - ! If variable is a constituent, then do nothing. We'll handle these later + ! If variable is a constituent, then do nothing. We'll handle these later. + + case (init_mark_idx) + + ! If variable only has an initial_value but not read from file, then do nothing, even if it is modified by the physics scheme. + ! There is nothing we can check against. case (no_exist_idx)