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 ace5eabf..bb1a327f 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
@@ -153,15 +153,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 04316ed7..d2ed56b7 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
@@ -153,15 +153,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 25e77e2b..33cbbd8d 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
@@ -153,15 +153,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 ef5db742..20245ac4 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
@@ -153,15 +153,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 881184d4..6e948e09 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
@@ -154,15 +154,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 0c0e0827..8e819e3d 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
@@ -153,15 +153,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 f90095d1..c64bd92a 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
@@ -154,15 +154,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 9e40162a..bfd6fde4 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
@@ -153,15 +153,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 3d5bc4de..8b23f945 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
@@ -152,15 +152,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 d1d15748..11686cfd 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
@@ -153,15 +153,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 7a376923..d1b12beb 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
@@ -153,15 +153,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 58bff3f1..b6862cf5 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
@@ -153,15 +153,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then
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 d62b832b..22e69a7d 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
@@ -153,15 +153,15 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia
                      constituent_has_default = .false.
                      call const_props(constituent_idx)%has_default(constituent_has_default,       &
                           constituent_errflg, constituent_errmsg)
-                     if (constituent_errflg .ne. 0) then
-                        call endrun(constituent_errmsg)
+                     if (constituent_errflg /= 0) then
+                        call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                      end if
                      if (constituent_has_default) then
                         call                                                                      &
                              const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,&
                              constituent_errmsg)
-                        if (constituent_errflg .ne. 0) then
-                           call endrun(constituent_errmsg)
+                        if (constituent_errflg /= 0) then
+                           call endrun(constituent_errmsg, file=__FILE__, line=__LINE__)
                         end if
                         field_data_ptr(:,:,constituent_idx) = constituent_default_value
                         if (masterproc) then