fix minor syntax errors

ESCOMP · Oct 16, 2024 · 452f068 · 452f068
1 parent a29d7c0
commit 452f068
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/schemes/musica/musica_ccpp.F90 b/schemes/musica/musica_ccpp.F90
@@ -10,16 +10,16 @@ module musica_ccpp
 
 contains
 
-  subroutine musica_ccpp_register(solver_type, num_grid_cells, constituents, errmsg, errcode)
+  subroutine musica_ccpp_register(solver_type, num_grid_cells, constituent_props, errmsg, errcode)
     use ccpp_constituent_prop_mod, only: ccpp_constituent_properties_t
 
     integer,                                          intent(in)  :: solver_type
     integer,                                          intent(in)  :: num_grid_cells
-    type(ccpp_constituent_properties_t), allocatable, intent(out) :: constituents(:)
+    type(ccpp_constituent_properties_t), allocatable, intent(out) :: constituent_props(:)
     character(len=512),                               intent(out) :: errmsg
     integer,                                          intent(out) :: errcode
 
-    call micm_register(solver_type, num_grid_cells, constituents, errmsg, errcode)
+    call micm_register(solver_type, num_grid_cells, constituent_props, errmsg, errcode)
 
   end subroutine musica_ccpp_register
 
@@ -43,10 +43,9 @@ end subroutine musica_ccpp_init
   !> \section arg_table_musica_ccpp_run Argument Table
   !! \htmlinclude musica_ccpp_run.html
   subroutine musica_ccpp_run(time_step, temperature, pressure, dry_air_density, constituent_props, &
-                      constituents, geopotential_height_wrt_surface_at_midpoint, &
-                      geopotential_height_wrt_surface_at_interface, &
-                      surface_geopotential, reciprocal_of_gravitational_acceleration, &
-                      errmsg, errcode)
+                             constituents, geopotential_height_wrt_surface_at_midpoint,            &
+                             geopotential_height_wrt_surface_at_interface, surface_geopotential,   &
+                             reciprocal_of_gravitational_acceleration, errmsg, errcode)
     use musica_ccpp_micm_util,     only: reshape_into_micm_arr, reshape_into_ccpp_arr
     use musica_ccpp_micm_util,     only: convert_to_mol_per_cubic_meter, convert_to_mass_mixing_ratio
     use ccpp_constituent_prop_mod, only: ccpp_constituent_prop_ptr_t
@@ -130,8 +129,8 @@ end subroutine musica_ccpp_run
   !> \section arg_table_musica_ccpp_final Argument Table
   !! \htmlinclude musica_ccpp_final.html
   subroutine musica_ccpp_final(errmsg, errcode)
-    integer,            intent(out) :: errcode
     character(len=512), intent(out) :: errmsg
+    integer,            intent(out) :: errcode
 
     call tuvx_final(errmsg, errcode)
     call micm_final(errmsg, errcode)

diff --git a/test/musica/test_musica_api.F90 b/test/musica/test_musica_api.F90
@@ -112,10 +112,9 @@ subroutine test_musica_ccpp_api()
     write(*,fmt="(4(3x,e13.6))") constituents
 
     call musica_ccpp_run(time_step, temperature, pressure, dry_air_density, constituent_props_ptr, &
-                        constituents, geopotential_height_wrt_surface_at_midpoint, &
-                        geopotential_height_wrt_surface_at_interface, &
-                        surface_geopotential, reciprocal_of_gravitational_acceleration, &
-                        errmsg, errcode)
+                         constituents, geopotential_height_wrt_surface_at_midpoint,                &
+                         geopotential_height_wrt_surface_at_interface, surface_geopotential,       &
+                         reciprocal_of_gravitational_acceleration, errmsg, errcode)
     if (errcode /= 0) then
       write(*,*) trim(errmsg)
       stop 3