From 006f41214d7c264ed8a735163c38e09f4548d330 Mon Sep 17 00:00:00 2001
From: Courtney Peverley <courtneyp@izumi.cgd.ucar.edu>
Date: Thu, 19 Sep 2024 23:27:46 -0600
Subject: [PATCH] fix unit tests

---
 test/unit/sample_files/write_init_files/physics_inputs_4D.F90 | 4 ++--
 .../unit/sample_files/write_init_files/physics_inputs_bvd.F90 | 4 ++--
 .../sample_files/write_init_files/physics_inputs_cnst.F90     | 4 ++--
 .../unit/sample_files/write_init_files/physics_inputs_ddt.F90 | 4 ++--
 .../sample_files/write_init_files/physics_inputs_ddt2.F90     | 4 ++--
 .../write_init_files/physics_inputs_ddt_array.F90             | 4 ++--
 .../sample_files/write_init_files/physics_inputs_host_var.F90 | 4 ++--
 test/unit/sample_files/write_init_files/physics_inputs_mf.F90 | 4 ++--
 .../sample_files/write_init_files/physics_inputs_no_horiz.F90 | 4 ++--
 .../sample_files/write_init_files/physics_inputs_noreq.F90    | 4 ++--
 .../sample_files/write_init_files/physics_inputs_param.F90    | 4 ++--
 .../sample_files/write_init_files/physics_inputs_protect.F90  | 4 ++--
 .../sample_files/write_init_files/physics_inputs_scalar.F90   | 4 ++--
 .../sample_files/write_init_files/physics_inputs_simple.F90   | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/test/unit/sample_files/write_init_files/physics_inputs_4D.F90 b/test/unit/sample_files/write_init_files/physics_inputs_4D.F90
index fcb3802a..e8476971 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_4D.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_4D.F90
@@ -210,12 +210,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_bvd.F90 b/test/unit/sample_files/write_init_files/physics_inputs_bvd.F90
index 5bf9cf29..976c8981 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_bvd.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_bvd.F90
@@ -210,12 +210,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_cnst.F90 b/test/unit/sample_files/write_init_files/physics_inputs_cnst.F90
index 7c830ac2..dbd43ff8 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_cnst.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_cnst.F90
@@ -210,12 +210,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_ddt.F90 b/test/unit/sample_files/write_init_files/physics_inputs_ddt.F90
index 1810ede6..126b459c 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_ddt.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_ddt.F90
@@ -210,12 +210,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_ddt2.F90 b/test/unit/sample_files/write_init_files/physics_inputs_ddt2.F90
index ba66a2cf..90ccfb50 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_ddt2.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_ddt2.F90
@@ -210,12 +210,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_ddt_array.F90 b/test/unit/sample_files/write_init_files/physics_inputs_ddt_array.F90
index dd7140bb..5aa6eead 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_ddt_array.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_ddt_array.F90
@@ -210,12 +210,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_host_var.F90 b/test/unit/sample_files/write_init_files/physics_inputs_host_var.F90
index 484c4007..c63724fc 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_host_var.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_host_var.F90
@@ -207,12 +207,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_mf.F90 b/test/unit/sample_files/write_init_files/physics_inputs_mf.F90
index 73667769..862bdd95 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_mf.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_mf.F90
@@ -211,12 +211,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_no_horiz.F90 b/test/unit/sample_files/write_init_files/physics_inputs_no_horiz.F90
index c229e563..ae3fed69 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_no_horiz.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_no_horiz.F90
@@ -210,12 +210,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_noreq.F90 b/test/unit/sample_files/write_init_files/physics_inputs_noreq.F90
index a1703efe..56327041 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_noreq.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_noreq.F90
@@ -203,12 +203,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_param.F90 b/test/unit/sample_files/write_init_files/physics_inputs_param.F90
index ab098ff6..2052b72b 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_param.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_param.F90
@@ -213,12 +213,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_protect.F90 b/test/unit/sample_files/write_init_files/physics_inputs_protect.F90
index d0395c3a..91eeaf8b 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_protect.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_protect.F90
@@ -210,12 +210,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_scalar.F90 b/test/unit/sample_files/write_init_files/physics_inputs_scalar.F90
index 07ca4c12..9b1333f7 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_scalar.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_scalar.F90
@@ -210,12 +210,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if
diff --git a/test/unit/sample_files/write_init_files/physics_inputs_simple.F90 b/test/unit/sample_files/write_init_files/physics_inputs_simple.F90
index 37e8cb6f..e0473e59 100644
--- a/test/unit/sample_files/write_init_files/physics_inputs_simple.F90
+++ b/test/unit/sample_files/write_init_files/physics_inputs_simple.F90
@@ -210,12 +210,12 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                end if
                field_data_ptr(:,:,constituent_idx) = constituent_default_value
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' initialized to default value: ', constituent_default_value
+                  write(iulog,*) 'Constituent ', trim(std_name), ' initialized to default value: ', constituent_default_value
                end if
             else
                field_data_ptr(:,:,constituent_idx) = 0._kind_phys
                if (masterproc) then
-                  write(iulog,*) 'Constituent ', trim(ccpp_required_data(req_idx)), ' default value not configured.  Setting to 0.'
+                  write(iulog,*) 'Constituent ', trim(std_name), ' default value not configured.  Setting to 0.'
                end if
             end if
          end if