Fix failing python unit tests.

ESCOMP · Oct 10, 2023 · fa78349 · fa78349
1 parent 898207e
commit fa78349
Show file tree

Hide file tree

Showing 26 changed files with 686 additions and 1,102 deletions.
diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_4D.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_4D.F90
@@ -47,20 +47,20 @@ module phys_vars_init_check_4D
       'potential_temperature    ', &
       'air_pressure_at_sea_level' /)
 
-   character(len=37), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
-      "ccpp_constituent_array               ", &
-      "ccpp_constituent_array_minimum_values", &
-      "ccpp_constituent_properties_array    ", &
-      "ccpp_num_advected_constituents       ", &
-      "ccpp_num_constituents                ", &
-      "do_log_output                        ", &
-      "log_output_unit                      ", &
-      "mpi_communicator                     ", &
-      "mpi_rank                             ", &
-      "mpi_root                             ", &
-      "number_of_mpi_tasks                  ", &
-      "suite_name                           ", &
-      "suite_part                           " /)
+   character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
+      "ccpp_constituent_minimum_values     ", &
+      "ccpp_constituent_properties         ", &
+      "ccpp_constituents                   ", &
+      "do_log_output                       ", &
+      "log_output_unit                     ", &
+      "mpi_communicator                    ", &
+      "mpi_rank                            ", &
+      "mpi_root                            ", &
+      "number_of_ccpp_advected_constituents", &
+      "number_of_ccpp_constituents         ", &
+      "number_of_mpi_tasks                 ", &
+      "suite_name                          ", &
+      "suite_part                          " /)
    !Array storing all registered IC file input names for each variable:
    character(len=5), public, protected :: input_var_names(1, phys_var_num) = reshape((/ &
       'theta', &

diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_bvd.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_bvd.F90
@@ -47,20 +47,20 @@ module phys_vars_init_check_bvd
       'potential_temperature    ', &
       'air_pressure_at_sea_level' /)
 
-   character(len=37), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
-      "ccpp_constituent_array               ", &
-      "ccpp_constituent_array_minimum_values", &
-      "ccpp_constituent_properties_array    ", &
-      "ccpp_num_advected_constituents       ", &
-      "ccpp_num_constituents                ", &
-      "do_log_output                        ", &
-      "log_output_unit                      ", &
-      "mpi_communicator                     ", &
-      "mpi_rank                             ", &
-      "mpi_root                             ", &
-      "number_of_mpi_tasks                  ", &
-      "suite_name                           ", &
-      "suite_part                           " /)
+   character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
+      "ccpp_constituent_minimum_values     ", &
+      "ccpp_constituent_properties         ", &
+      "ccpp_constituents                   ", &
+      "do_log_output                       ", &
+      "log_output_unit                     ", &
+      "mpi_communicator                    ", &
+      "mpi_rank                            ", &
+      "mpi_root                            ", &
+      "number_of_ccpp_advected_constituents", &
+      "number_of_ccpp_constituents         ", &
+      "number_of_mpi_tasks                 ", &
+      "suite_name                          ", &
+      "suite_part                          " /)
    !Array storing all registered IC file input names for each variable:
    character(len=5), public, protected :: input_var_names(1, phys_var_num) = reshape((/ &
       'theta', &

diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt.F90
@@ -47,20 +47,20 @@ module phys_vars_init_check_ddt
       'potential_temperature    ', &
       'air_pressure_at_sea_level' /)
 
-   character(len=37), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
-      "ccpp_constituent_array               ", &
-      "ccpp_constituent_array_minimum_values", &
-      "ccpp_constituent_properties_array    ", &
-      "ccpp_num_advected_constituents       ", &
-      "ccpp_num_constituents                ", &
-      "do_log_output                        ", &
-      "log_output_unit                      ", &
-      "mpi_communicator                     ", &
-      "mpi_rank                             ", &
-      "mpi_root                             ", &
-      "number_of_mpi_tasks                  ", &
-      "suite_name                           ", &
-      "suite_part                           " /)
+   character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
+      "ccpp_constituent_minimum_values     ", &
+      "ccpp_constituent_properties         ", &
+      "ccpp_constituents                   ", &
+      "do_log_output                       ", &
+      "log_output_unit                     ", &
+      "mpi_communicator                    ", &
+      "mpi_rank                            ", &
+      "mpi_root                            ", &
+      "number_of_ccpp_advected_constituents", &
+      "number_of_ccpp_constituents         ", &
+      "number_of_mpi_tasks                 ", &
+      "suite_name                          ", &
+      "suite_part                          " /)
    !Array storing all registered IC file input names for each variable:
    character(len=5), public, protected :: input_var_names(1, phys_var_num) = reshape((/ &
       'theta', &

diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt2.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt2.F90
@@ -47,20 +47,20 @@ module phys_vars_init_check_ddt2
       'potential_temperature    ', &
       'air_pressure_at_sea_level' /)
 
-   character(len=37), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
-      "ccpp_constituent_array               ", &
-      "ccpp_constituent_array_minimum_values", &
-      "ccpp_constituent_properties_array    ", &
-      "ccpp_num_advected_constituents       ", &
-      "ccpp_num_constituents                ", &
-      "do_log_output                        ", &
-      "log_output_unit                      ", &
-      "mpi_communicator                     ", &
-      "mpi_rank                             ", &
-      "mpi_root                             ", &
-      "number_of_mpi_tasks                  ", &
-      "suite_name                           ", &
-      "suite_part                           " /)
+   character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
+      "ccpp_constituent_minimum_values     ", &
+      "ccpp_constituent_properties         ", &
+      "ccpp_constituents                   ", &
+      "do_log_output                       ", &
+      "log_output_unit                     ", &
+      "mpi_communicator                    ", &
+      "mpi_rank                            ", &
+      "mpi_root                            ", &
+      "number_of_ccpp_advected_constituents", &
+      "number_of_ccpp_constituents         ", &
+      "number_of_mpi_tasks                 ", &
+      "suite_name                          ", &
+      "suite_part                          " /)
    !Array storing all registered IC file input names for each variable:
    character(len=5), public, protected :: input_var_names(1, phys_var_num) = reshape((/ &
       'theta', &

diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt_array.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt_array.F90
@@ -47,20 +47,20 @@ module phys_vars_init_check_ddt_array
       'potential_temperature    ', &
       'air_pressure_at_sea_level' /)
 
-   character(len=37), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
-      "ccpp_constituent_array               ", &
-      "ccpp_constituent_array_minimum_values", &
-      "ccpp_constituent_properties_array    ", &
-      "ccpp_num_advected_constituents       ", &
-      "ccpp_num_constituents                ", &
-      "do_log_output                        ", &
-      "log_output_unit                      ", &
-      "mpi_communicator                     ", &
-      "mpi_rank                             ", &
-      "mpi_root                             ", &
-      "number_of_mpi_tasks                  ", &
-      "suite_name                           ", &
-      "suite_part                           " /)
+   character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
+      "ccpp_constituent_minimum_values     ", &
+      "ccpp_constituent_properties         ", &
+      "ccpp_constituents                   ", &
+      "do_log_output                       ", &
+      "log_output_unit                     ", &
+      "mpi_communicator                    ", &
+      "mpi_rank                            ", &
+      "mpi_root                            ", &
+      "number_of_ccpp_advected_constituents", &
+      "number_of_ccpp_constituents         ", &
+      "number_of_mpi_tasks                 ", &
+      "suite_name                          ", &
+      "suite_part                          " /)
    !Array storing all registered IC file input names for each variable:
    character(len=39), public, protected :: input_var_names(1, phys_var_num) = reshape((/ &
       'T(:, :, index_of_potential_temperature)', &

diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_host_var.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_host_var.F90
@@ -46,20 +46,20 @@ module phys_vars_init_check_host_var
    character(len=25), public, protected :: phys_var_stdnames(phys_var_num) = (/ &
       'air_pressure_at_sea_level' /)
 
-   character(len=37), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
-      "ccpp_constituent_array               ", &
-      "ccpp_constituent_array_minimum_values", &
-      "ccpp_constituent_properties_array    ", &
-      "ccpp_num_advected_constituents       ", &
-      "ccpp_num_constituents                ", &
-      "do_log_output                        ", &
-      "log_output_unit                      ", &
-      "mpi_communicator                     ", &
-      "mpi_rank                             ", &
-      "mpi_root                             ", &
-      "number_of_mpi_tasks                  ", &
-      "suite_name                           ", &
-      "suite_part                           " /)
+   character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
+      "ccpp_constituent_minimum_values     ", &
+      "ccpp_constituent_properties         ", &
+      "ccpp_constituents                   ", &
+      "do_log_output                       ", &
+      "log_output_unit                     ", &
+      "mpi_communicator                    ", &
+      "mpi_rank                            ", &
+      "mpi_root                            ", &
+      "number_of_ccpp_advected_constituents", &
+      "number_of_ccpp_constituents         ", &
+      "number_of_mpi_tasks                 ", &
+      "suite_name                          ", &
+      "suite_part                          " /)
    !Array storing all registered IC file input names for each variable:
    character(len=3), public, protected :: input_var_names(1, phys_var_num) = reshape((/ &
       'slp' /), (/1, phys_var_num/))

diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_mf.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_mf.F90
@@ -47,20 +47,20 @@ module phys_vars_init_check_mf
       'potential_temperature    ', &
       'air_pressure_at_sea_level' /)
 
-   character(len=37), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
-      "ccpp_constituent_array               ", &
-      "ccpp_constituent_array_minimum_values", &
-      "ccpp_constituent_properties_array    ", &
-      "ccpp_num_advected_constituents       ", &
-      "ccpp_num_constituents                ", &
-      "do_log_output                        ", &
-      "log_output_unit                      ", &
-      "mpi_communicator                     ", &
-      "mpi_rank                             ", &
-      "mpi_root                             ", &
-      "number_of_mpi_tasks                  ", &
-      "suite_name                           ", &
-      "suite_part                           " /)
+   character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
+      "ccpp_constituent_minimum_values     ", &
+      "ccpp_constituent_properties         ", &
+      "ccpp_constituents                   ", &
+      "do_log_output                       ", &
+      "log_output_unit                     ", &
+      "mpi_communicator                    ", &
+      "mpi_rank                            ", &
+      "mpi_root                            ", &
+      "number_of_ccpp_advected_constituents", &
+      "number_of_ccpp_constituents         ", &
+      "number_of_mpi_tasks                 ", &
+      "suite_name                          ", &
+      "suite_part                          " /)
    !Array storing all registered IC file input names for each variable:
    character(len=5), public, protected :: input_var_names(1, phys_var_num) = reshape((/ &
       'theta', &

diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_no_horiz.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_no_horiz.F90
@@ -47,20 +47,20 @@ module phys_vars_init_check_no_horiz
       'potential_temperature    ', &
       'air_pressure_at_sea_level' /)
 
-   character(len=37), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
-      "ccpp_constituent_array               ", &
-      "ccpp_constituent_array_minimum_values", &
-      "ccpp_constituent_properties_array    ", &
-      "ccpp_num_advected_constituents       ", &
-      "ccpp_num_constituents                ", &
-      "do_log_output                        ", &
-      "log_output_unit                      ", &
-      "mpi_communicator                     ", &
-      "mpi_rank                             ", &
-      "mpi_root                             ", &
-      "number_of_mpi_tasks                  ", &
-      "suite_name                           ", &
-      "suite_part                           " /)
+   character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
+      "ccpp_constituent_minimum_values     ", &
+      "ccpp_constituent_properties         ", &
+      "ccpp_constituents                   ", &
+      "do_log_output                       ", &
+      "log_output_unit                     ", &
+      "mpi_communicator                    ", &
+      "mpi_rank                            ", &
+      "mpi_root                            ", &
+      "number_of_ccpp_advected_constituents", &
+      "number_of_ccpp_constituents         ", &
+      "number_of_mpi_tasks                 ", &
+      "suite_name                          ", &
+      "suite_part                          " /)
    !Array storing all registered IC file input names for each variable:
    character(len=5), public, protected :: input_var_names(1, phys_var_num) = reshape((/ &
       'theta', &

diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_noreq.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_noreq.F90
@@ -45,20 +45,20 @@ module phys_vars_init_check_noreq
    ! Physics-related input variable standard names:
    character(len=0), public, protected :: phys_var_stdnames(phys_var_num)
 
-   character(len=37), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
-      "ccpp_constituent_array               ", &
-      "ccpp_constituent_array_minimum_values", &
-      "ccpp_constituent_properties_array    ", &
-      "ccpp_num_advected_constituents       ", &
-      "ccpp_num_constituents                ", &
-      "do_log_output                        ", &
-      "log_output_unit                      ", &
-      "mpi_communicator                     ", &
-      "mpi_rank                             ", &
-      "mpi_root                             ", &
-      "number_of_mpi_tasks                  ", &
-      "suite_name                           ", &
-      "suite_part                           " /)
+   character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
+      "ccpp_constituent_minimum_values     ", &
+      "ccpp_constituent_properties         ", &
+      "ccpp_constituents                   ", &
+      "do_log_output                       ", &
+      "log_output_unit                     ", &
+      "mpi_communicator                    ", &
+      "mpi_rank                            ", &
+      "mpi_root                            ", &
+      "number_of_ccpp_advected_constituents", &
+      "number_of_ccpp_constituents         ", &
+      "number_of_mpi_tasks                 ", &
+      "suite_name                          ", &
+      "suite_part                          " /)
    !Array storing all registered IC file input names for each variable:
    character(len=0), public, protected :: input_var_names(0, phys_var_num)
 

diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_param.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_param.F90
@@ -48,20 +48,20 @@ module phys_vars_init_check_param
       'air_pressure_at_sea_level ', &
       'gravitational_acceleration' /)
 
-   character(len=37), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
-      "ccpp_constituent_array               ", &
-      "ccpp_constituent_array_minimum_values", &
-      "ccpp_constituent_properties_array    ", &
-      "ccpp_num_advected_constituents       ", &
-      "ccpp_num_constituents                ", &
-      "do_log_output                        ", &
-      "log_output_unit                      ", &
-      "mpi_communicator                     ", &
-      "mpi_rank                             ", &
-      "mpi_root                             ", &
-      "number_of_mpi_tasks                  ", &
-      "suite_name                           ", &
-      "suite_part                           " /)
+   character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
+      "ccpp_constituent_minimum_values     ", &
+      "ccpp_constituent_properties         ", &
+      "ccpp_constituents                   ", &
+      "do_log_output                       ", &
+      "log_output_unit                     ", &
+      "mpi_communicator                    ", &
+      "mpi_rank                            ", &
+      "mpi_root                            ", &
+      "number_of_ccpp_advected_constituents", &
+      "number_of_ccpp_constituents         ", &
+      "number_of_mpi_tasks                 ", &
+      "suite_name                          ", &
+      "suite_part                          " /)
    !Array storing all registered IC file input names for each variable:
    character(len=5), public, protected :: input_var_names(1, phys_var_num) = reshape((/ &
       'theta', &

diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_protect.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_protect.F90
@@ -47,20 +47,20 @@ module phys_vars_init_check_protect
       'potential_temperature    ', &
       'air_pressure_at_sea_level' /)
 
-   character(len=37), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
-      "ccpp_constituent_array               ", &
-      "ccpp_constituent_array_minimum_values", &
-      "ccpp_constituent_properties_array    ", &
-      "ccpp_num_advected_constituents       ", &
-      "ccpp_num_constituents                ", &
-      "do_log_output                        ", &
-      "log_output_unit                      ", &
-      "mpi_communicator                     ", &
-      "mpi_rank                             ", &
-      "mpi_root                             ", &
-      "number_of_mpi_tasks                  ", &
-      "suite_name                           ", &
-      "suite_part                           " /)
+   character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ &
+      "ccpp_constituent_minimum_values     ", &
+      "ccpp_constituent_properties         ", &
+      "ccpp_constituents                   ", &
+      "do_log_output                       ", &
+      "log_output_unit                     ", &
+      "mpi_communicator                    ", &
+      "mpi_rank                            ", &
+      "mpi_root                            ", &
+      "number_of_ccpp_advected_constituents", &
+      "number_of_ccpp_constituents         ", &
+      "number_of_mpi_tasks                 ", &
+      "suite_name                          ", &
+      "suite_part                          " /)
    !Array storing all registered IC file input names for each variable:
    character(len=5), public, protected :: input_var_names(1, phys_var_num) = reshape((/ &
       'theta', &