diff --git a/src/core_atmosphere/CMakeLists.txt b/src/core_atmosphere/CMakeLists.txt
index ea4f57448e..49a6d07bf6 100644
--- a/src/core_atmosphere/CMakeLists.txt
+++ b/src/core_atmosphere/CMakeLists.txt
@@ -109,9 +109,10 @@ list(TRANSFORM ATMOSPHERE_CORE_PHYSICS_WRF_SOURCES PREPEND physics/physics_wrf/)
 
 # physics/physics_noaa/GFL/
 set(ATMOSPHERE_CORE_PHYSICS_GFL_SOURCES
-    MPAS/module_cu_gfl_mpas.F
-    module_cu_gfl_deep.F
-    module_cu_gfl_sh.F
+    MPAS/module_cu_gfl_common.F90
+    MPAS/module_cu_gfl_mpas.F90
+    module_cu_gfl_deep.F90
+    module_cu_gfl_sh.F90
 )
 list(TRANSFORM ATMOSPHERE_CORE_PHYSICS_GFL_SOURCES PREPEND physics/physics_noaa/GFL/)
 
diff --git a/src/core_atmosphere/physics/Makefile b/src/core_atmosphere/physics/Makefile
index 2fe1019b08..20fe3afeb7 100644
--- a/src/core_atmosphere/physics/Makefile
+++ b/src/core_atmosphere/physics/Makefile
@@ -77,7 +77,7 @@ core_RUCLSM: core_physics_init core_physics_mmm
 	(cd physics_noaa/RUCLSM; cp ./MPAS/Makefile .; cp ./MPAS/module_ruc_land.F90 .; cp ./MPAS/module_ruc_ice.F90 .; cp ./MPAS/module_sf_sfcdiags_ruclsm.F .; $(MAKE) all COREDEF="$(COREDEF)")
 
 core_GFL: core_physics_init core_physics_mmm
-	(cd physics_noaa/GFL; cp ./MPAS/Makefile .; cp ./MPAS/module_cu_gfl_mpas.F .; $(MAKE) all)
+	(cd physics_noaa/GFL; cp ./MPAS/Makefile .; cp ./MPAS/module_cu_gfl_mpas.F90 .; cp ./MPAS/module_cu_gfl_common.F90 .; $(MAKE) all)
 
 core_UGWP: core_physics_init
 	(cd physics_noaa/UGWP; $(MAKE) all)
diff --git a/src/core_atmosphere/physics/physics_noaa/GFL b/src/core_atmosphere/physics/physics_noaa/GFL
index 9f55b90145..da214d1246 160000
--- a/src/core_atmosphere/physics/physics_noaa/GFL
+++ b/src/core_atmosphere/physics/physics_noaa/GFL
@@ -1 +1 @@
-Subproject commit 9f55b9014506619083b6b8ccacb26bceafbacad6
+Subproject commit da214d1246fbbad2cb53b6164b30a98069368fa0