Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bring GFS.v16 features back to develop branch #196

Merged
merged 9 commits into from
Nov 17, 2020
Merged

Bring GFS.v16 features back to develop branch #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
26bf417
update post lib to upp lib and add dzmin change in fv3 dycore
junwang-noaa Oct 15, 2020
791c68a
change nceppost to upp
junwang-noaa Oct 29, 2020
74dc535
update to top of fv3 develop branch
junwang-noaa Oct 29, 2020
3077139
add dycore change #35
junwang-noaa Nov 12, 2020
f0e9d38
merge with top of dev/emc dycore branch
junwang-noaa Nov 12, 2020
6b8f436
Merge remote-tracking branch 'upstream/develop' into gfsv16
junwang-noaa Nov 12, 2020
ff04f47
remove duplicate read_data in fms_mod in external_ic.F90
junwang-noaa Nov 13, 2020
df1313d
Merge remote-tracking branch 'upstream/develop' into gfsv16
junwang-noaa Nov 13, 2020
060f3d6
point dycore to dev/emc
junwang-noaa Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
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
Open in desktop
Submodule atmos_cubed_sphere updated 3 files
+11 −11 model/nh_utils.F90
+5 −8 tools/external_ic.F90
+4 −4 tools/fv_grid_tools.F90
2 changes: 1 addition & 1 deletion io/CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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