Skip to content

Commit

Permalink
Bring GFS.v16 features back to develop branch (#196)
Browse files Browse the repository at this point in the history
* update post lib to upp lib and add dzmin change in fv3 dycore
* add dycore change #35
* merge with top of dev/emc dycore branch
* remove duplicate read_data in fms_mod in external_ic.F90
  • Loading branch information
junwang-noaa committed Nov 17, 2020
1 parent 3bd9665 commit 4fdf7c6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion atmos_cubed_sphere
2 changes: 1 addition & 1 deletion io/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions io/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down

0 comments on commit 4fdf7c6

Please sign in to comment.