diff --git a/.gitmodules b/.gitmodules
index 1325b422..ff583898 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,8 +19,8 @@
fxDONOTUSEurl = https://github.com/MPAS-Dev/MPAS-Model.git
[submodule "ncar-physics"]
path = src/physics/ncar_ccpp
- url = https://github.com/ESCOMP/atmospheric_physics
- fxtag = d2e6f343356f02229bcc66427d300e578e09c64f
+ url = https://github.com/nusbaume/atmospheric_physics
+ fxtag = 22a3457
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
[submodule "rrtmgp-data"]
diff --git a/cime_config/create_readnl_files.py b/cime_config/create_readnl_files.py
index ad409aae..f044f83d 100644
--- a/cime_config/create_readnl_files.py
+++ b/cime_config/create_readnl_files.py
@@ -995,16 +995,6 @@ def __init__(self, args, description, schema_paths=None, logger=None):
else:
self.__outdir = args.output_dir
# end if
- if logger:
- if args.debug:
- loglevel = logging.DEBUG
- elif args.quiet:
- loglevel = logging.ERROR
- else:
- loglevel = logging.INFO
- # end if
- logger.setLevel(loglevel)
- # end if
self.__scheme_read_file = None
self.__nlfile_arg = "nlfile"
self.__active_schemes_arg = "active_schemes"
diff --git a/src/data/registry.xml b/src/data/registry.xml
index fd9a8aa0..62898ae8 100644
--- a/src/data/registry.xml
+++ b/src/data/registry.xml
@@ -30,6 +30,8 @@
$SRCROOT/src/data/ref_pres.meta
$SRCROOT/src/dynamics/utils/vert_coord.meta
$SRCROOT/src/dynamics/utils/hycoef.meta
+
+ $SRCROOT/src/physics/ncar_ccpp/schemes/pumas/pumas/micro_pumas_diags.meta
@@ -43,6 +45,15 @@
+
+
+
+ 4
+
+
graupel mass mixing ratio with respect to moist air plus all airborne condensates
GRAUQM cnst_GRAUQM
+
+ mass number concentration of cloud liquid water wrt moist air plus all airborne condensates
+ horizontal_dimension vertical_layer_dimension
+ NUMLIQ cnst_NUMLIQ
+
+
+ mass number concentration of Cloud ice mass mixing ratio with respect to moist air plus all airborne condensates
+ horizontal_dimension vertical_layer_dimension
+ NUMICE cnst_NUMICE
+
+
+ mass number concentration of rain mass mixing ratio with respect to moist air plus all airborne condensates
+ horizontal_dimension vertical_layer_dimension
+ NUMRAI cnst_NUMRAI
+
+
+ mass number concentration of snow mass mixing ratio with respect to moist air plus all airborne condensates
+ NUMSNO cnst_NUMSNO
+
+
+ mass number concentration of graupel mass mixing ratio with respect to moist air plus all airborne condensates
+ NUMGRA cnst_NUMGRA
+
@@ -2003,6 +2047,123 @@
.false.
+
+
+ 0.8_kind_phys
+
+
+
+
+ horizontal_dimension vertical_layer_dimension
+ RELVAR pbuf_RELVAR
+
+
+ horizontal_dimension vertical_layer_dimension
+ ALST pbuf_ALST
+
+
+ horizontal_dimension vertical_layer_dimension
+ AIST pbuf_AIST
+
+
+ horizontal_dimension vertical_layer_dimension
+ QSATFAC pbuf_QSATFAC
+
+
+ horizontal_dimension vertical_layer_dimension
+ NAAI pbuf_NAAI
+
+
+ horizontal_dimension vertical_layer_dimension
+ NPCCN pbuf_NPCCN
+
+
+ horizontal_dimension vertical_layer_dimension dust_size_bins_dimension
+ RNDST pbuf_RNDST
+
+
+ horizontal_dimension vertical_layer_dimension dust_size_bins_dimension
+ NACON pbuf_NACON
+
+
+ horizontal_dimension vertical_layer_dimension
+ REI pbuf_REI
+
+ horizontal_dimension vertical_layer_dimension
+ 0
+ FRZIMM pbuf_FRZIMM
+
+
+ horizontal_dimension vertical_layer_dimension
+ 0
+ FRZCNT pbuf_FRZCNT
+
+
+ horizontal_dimension vertical_layer_dimension
+ 0
+ FRZDEP pbuf_FRZDEP
+
+ horizontal_dimension vertical_layer_dimension
+ accre_enhan pbuf_accre_enhan pbuf_ACCRE_ENHAN
+
+
+
+
+ horizontal_dimension vertical_layer_dimension
+ cnst_SNOWQM tnd_qsnow pbuf_tnd_qsnow
+
+
+ horizontal_dimension vertical_layer_dimension
+ cnst_NUMSNO tnd_nsnow pbuf_tnd_nsnow
+
+