From 62a433740fae781611cd22cc1d118b3708a66557 Mon Sep 17 00:00:00 2001
From: Courtney Peverley <courtneyp@izumi.cgd.ucar.edu>
Date: Thu, 31 Oct 2024 15:33:24 -0600
Subject: [PATCH 1/3] update musica interface to new register phase

---
 schemes/musica/musica_ccpp.F90  |  2 ++
 schemes/musica/musica_ccpp.meta | 39 +++++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/schemes/musica/musica_ccpp.F90 b/schemes/musica/musica_ccpp.F90
index 09364397..1ef2ea63 100644
--- a/schemes/musica/musica_ccpp.F90
+++ b/schemes/musica/musica_ccpp.F90
@@ -10,6 +10,8 @@ module musica_ccpp
 
 contains
 
+  !> \section arg_table_musica_ccpp_register Argument Table
+  !! \htmlinclude musica_ccpp_register.html
   subroutine musica_ccpp_register(solver_type, num_grid_cells, constituent_props, errmsg, errcode)
     use ccpp_constituent_prop_mod, only: ccpp_constituent_properties_t
 
diff --git a/schemes/musica/musica_ccpp.meta b/schemes/musica/musica_ccpp.meta
index 30d19bad..66d204a8 100644
--- a/schemes/musica/musica_ccpp.meta
+++ b/schemes/musica/musica_ccpp.meta
@@ -2,8 +2,29 @@
   name = musica_ccpp
   type = scheme
   dependencies = micm/musica_ccpp_micm.F90,micm/musica_ccpp_micm_util.F90,tuvx/musica_ccpp_tuvx.F90,tuvx/musica_ccpp_tuvx_height_grid.F90,musica_ccpp_util.F90
-  dynamic_constituent_routine = musica_ccpp_register
 
+[ccpp-arg-table]
+  name  = musica_ccpp_register
+  type  = scheme
+[ solver_type ]
+  standard_name = micm_solver_type
+  units = none
+  type = integer
+  dimensions = ()
+  intent = in
+[ num_grid_cells ]
+  standard_name = number_of_grid_cells
+  units = count
+  type = integer
+  dimensions = ()
+  intent = in
+[ constituent_props ]
+  standard_name = dynamic_constituents_for_musica_ccpp
+  units = none
+  dimensions = (:)
+  allocatable = True
+  type = ccpp_constituent_properties_t
+  intent = out
 [ccpp-arg-table]
   name  = musica_ccpp_init
   type  = scheme
@@ -13,6 +34,20 @@
   type = integer
   dimensions = ()
   intent = in
+[ errmsg ]
+  standard_name = ccpp_error_message
+  units = none
+  type = character | kind = len=512
+  dimensions = ()
+  intent = out
+[ errcode ]
+  standard_name = ccpp_error_code
+  units = 1
+  type = integer
+  dimensions = ()
+  intent = out
+
+[ccpp-arg-table]
 [ vertical_interface_dimension ]
   standard_name = vertical_interface_dimension
   units = none
@@ -140,4 +175,4 @@
   units = 1
   type = integer
   dimensions = ()
-  intent = out
\ No newline at end of file
+  intent = out

From 29240683c58952d2df966bfc5a49803609a57793 Mon Sep 17 00:00:00 2001
From: Courtney Peverley <courtneyp@izumi.cgd.ucar.edu>
Date: Thu, 31 Oct 2024 15:38:58 -0600
Subject: [PATCH 2/3] fix erroneous errmsg/errcode

---
 schemes/musica/musica_ccpp.meta | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/schemes/musica/musica_ccpp.meta b/schemes/musica/musica_ccpp.meta
index 66d204a8..751a447e 100644
--- a/schemes/musica/musica_ccpp.meta
+++ b/schemes/musica/musica_ccpp.meta
@@ -34,20 +34,6 @@
   type = integer
   dimensions = ()
   intent = in
-[ errmsg ]
-  standard_name = ccpp_error_message
-  units = none
-  type = character | kind = len=512
-  dimensions = ()
-  intent = out
-[ errcode ]
-  standard_name = ccpp_error_code
-  units = 1
-  type = integer
-  dimensions = ()
-  intent = out
-
-[ccpp-arg-table]
 [ vertical_interface_dimension ]
   standard_name = vertical_interface_dimension
   units = none

From c22774ba49a22b1cf27851ca12d2c28ca884b47f Mon Sep 17 00:00:00 2001
From: Courtney Peverley <courtneyp@izumi.cgd.ucar.edu>
Date: Thu, 31 Oct 2024 15:44:17 -0600
Subject: [PATCH 3/3] add errcode/errmsg to right place

---
 schemes/musica/musica_ccpp.meta | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/schemes/musica/musica_ccpp.meta b/schemes/musica/musica_ccpp.meta
index 751a447e..85e01f3e 100644
--- a/schemes/musica/musica_ccpp.meta
+++ b/schemes/musica/musica_ccpp.meta
@@ -25,6 +25,19 @@
   allocatable = True
   type = ccpp_constituent_properties_t
   intent = out
+[ errmsg ]
+  standard_name = ccpp_error_message
+  units = none
+  type = character | kind = len=512
+  dimensions = ()
+  intent = out
+[ errcode ]
+  standard_name = ccpp_error_code
+  units = 1
+  type = integer
+  dimensions = ()
+  intent = out
+
 [ccpp-arg-table]
   name  = musica_ccpp_init
   type  = scheme