Bring GFS.v16 features back to develop branch (NOAA-EMC#196)

* update post lib to upp lib and add dzmin change in fv3 dycore * add dycore change NOAA-EMC#35 * merge with top of dev/emc dycore branch * remove duplicate read_data in fms_mod in external_ic.F90
XiaSun-Atmos · Nov 17, 2020 · 4fdf7c6 · 4fdf7c6
1 parent 3bd9665
commit 4fdf7c6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -189,7 +189,7 @@ target_link_libraries(fv3atm PUBLIC nemsio::nemsio
                                     esmf)
 
 if(INLINE_POST)
-  target_link_libraries(fv3atm PUBLIC nceppost::nceppost)
+  target_link_libraries(fv3atm PUBLIC upp::upp)
 endif()
 
 if(OpenMP_Fortran_FOUND)

diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere
diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
@@ -38,7 +38,7 @@ target_link_libraries(io PRIVATE fms
                                  ipd)
 
 if(INLINE_POST)
-  target_link_libraries(io PRIVATE nceppost::nceppost)
+  target_link_libraries(io PRIVATE upp::upp)
 endif()
 
 if(CCPP)

diff --git a/io/makefile b/io/makefile
@@ -66,7 +66,7 @@ $(LIBRARY): $(OBJS)
 FV3GFS_io.o: FV3GFS_io.F90
 	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) -c FV3GFS_io.F90
 post_nems_routines.o: post_nems_routines.F90
-	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -I$(POST_INC) -c post_nems_routines.F90
+	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -I$(UPP_INC) -c post_nems_routines.F90
 module_write_nemsio.o: module_write_nemsio.F90
 	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) $(NEMSIOINC) -c module_write_nemsio.F90
 module_write_netcdf.o: module_write_netcdf.F90
@@ -80,7 +80,7 @@ module_write_internal_state.o: module_write_internal_state.F90
 module_wrt_grid_comp.o: module_wrt_grid_comp.F90
 	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) -c module_wrt_grid_comp.F90
 post_gfs.o: post_gfs.F90
-	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) -I$(POST_INC) -c post_gfs.F90
+	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) -I$(UPP_INC) -c post_gfs.F90
 post_gfs_stub.o: post_gfs_stub.F90
 	$(FC) $(CPPDEFS) $(CPPFLAGS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) $(ESMF_INC) -c post_gfs_stub.F90
+11 −11		model/nh_utils.F90
+5 −8		tools/external_ic.F90
+4 −4		tools/fv_grid_tools.F90