Merge pull request #1 from grantfirl/michelle-fork/master

Revert a couple of changes in preparation for docker integration
grantfirl · Feb 14, 2020 · 83a85e5 · 83a85e5
2 parents ffd99ca + bc36a05
commit 83a85e5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "ccpp-framework"]
 	path = ccpp/framework
 	url = https://github.com/NCAR/ccpp-framework
-	branch = master
+	branch = dtc/develop
 [submodule "ccpp-physics"]
 	path = ccpp/physics
 	url = https://github.com/NCAR/ccpp-physics
-	branch = master
+	branch = dtc/develop
diff --git a/ccpp/framework b/ccpp/framework
diff --git a/ccpp/physics b/ccpp/physics
+7 −0		CMakeLists.txt
+1 −1		CODEOWNERS
+5 −5		schemes/check/ccpp_prebuild_config.py
+1 −1		scripts/metadata_parser.py
+2 −2		scripts/mkcap.py
+5 −3		src/CMakeLists.txt
+48 −31		physics/cu_ntiedtke.F90
+20 −2		physics/cu_ntiedtke.meta
+6 −0		physics/docs/ccpp_doxyfile
+35 −0		physics/docs/pdftxt/GFS_SATMEDMFVDIFQ.txt
+1 −0		physics/docs/pdftxt/all_shemes_list.txt
+1 −1		physics/mfpbltq.f
+1 −1		physics/mfscuq.f
+1 −1		physics/module_gfdl_cloud_microphys.F90
+0 −10		physics/module_mp_thompson.F90
+0 −0		physics/module_sf_noahmp_glacier.f90
+0 −0		physics/module_sf_noahmplsm.f90
+1,555 −0		physics/moninedmf_hafs.f
+526 −0		physics/moninedmf_hafs.meta
+0 −0		physics/noahmp_tables.f90
+14 −14		physics/samfdeepcnv.f
+175 −79		physics/satmedmfvdifq.F
+0 −0		physics/sfc_noahmp_drv.f
+3 −0		physics/tridi.f