Change logic on how/where kind and type definitions are compiled

dustinswales · Mar 26, 2020 · c2d86c7 · c2d86c7
1 parent a781194
commit c2d86c7
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -17,6 +17,7 @@
     'ccpp/physics/physics/radsw_param.f',
     'ccpp/physics/physics/radlw_param.f',
     'scm/src/GFS_typedefs.F90',
+    'scm/src/gmtb_scm_kinds.F90',
     'scm/src/gmtb_scm_type_defs.F90',
     'scm/src/gmtb_scm_physical_constants.F90',
     'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
@@ -199,6 +200,7 @@
     # derived data type definitions
     'scm/src/GFS_typedefs.F90',
     'scm/src/gmtb_scm_kinds.F90',
+    'scm/src/gmtb_scm_physical_constants.F90',
     'scm/src/gmtb_scm_type_defs.F90',
 ]
 

diff --git a/scm/src/CMakeLists.txt b/scm/src/CMakeLists.txt
@@ -297,9 +297,6 @@ SET(scm_source_files gmtb_scm.F90
             gmtb_scm_forcing.F90
             gmtb_scm_time_integration.F90
             gmtb_scm_output.F90
-            gmtb_scm_kinds.F90
-            gmtb_scm_physical_constants.F90
-            gmtb_scm_type_defs.F90
 )
 
 if(STATIC)

diff --git a/scm/src/gmtb_scm_kinds.F90 b/scm/src/gmtb_scm_kinds.F90
@@ -3,8 +3,12 @@
 
 module gmtb_scm_kinds
 
+!! \section arg_table_gmtb_scm_kinds
+!! \htmlinclude gmtb_scm_kinds.html
+!!
+
   integer, parameter :: sp  = selected_real_kind(P= 6,R=37)
-	integer, parameter :: dp  = selected_real_kind(P=13,R=300)
-	integer, parameter :: qp = selected_real_kind(P=27,R=2400)
+  integer, parameter :: dp  = selected_real_kind(P=13,R=300)
+  integer, parameter :: qp = selected_real_kind(P=27,R=2400)
 
 end module gmtb_scm_kinds
diff --git a/scm/src/gmtb_scm_kinds.meta b/scm/src/gmtb_scm_kinds.meta
@@ -0,0 +1,21 @@
+[ccpp-arg-table]
+  name = gmtb_scm_kinds
+  type = module
+[kind_sp]
+  standard_name = kind_sp
+  long_name = definition of kind_sp
+  units = none
+  dimensions = ()
+  type = integer
+[kind_dp]
+  standard_name = kind_dp
+  long_name = definition of kind_dp
+  units = none
+  dimensions = ()
+  type = integer
+[kind_qp]
+  standard_name = kind_qp
+  long_name = definition of kind_qp
+  units = none
+  dimensions = ()
+  type = integer