From 26bf417ee4a8557c7943ebcd2ccfc10b9249dd72 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Thu, 15 Oct 2020 13:42:23 +0000 Subject: [PATCH 1/6] update post lib to upp lib and add dzmin change in fv3 dycore --- .gitmodules | 4 ++-- CMakeLists.txt | 2 +- atmos_cubed_sphere | 2 +- io/makefile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..5375766eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere - branch = dev/emc + url = https://github.com/junwang-noaa/GFDL_atmos_cubed_sphere + branch = gfsv16 [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/CMakeLists.txt b/CMakeLists.txt index 320a1580b..37285a443 100644 --- 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 index 2ec76f886..57ba21c07 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 2ec76f886450b1c58d2f7eb18f0553a1e77fb831 +Subproject commit 57ba21c0744f20b6ba20c9fb56147786b91415d9 diff --git a/io/makefile b/io/makefile index eda6adb39..99a0dbdce 100644 --- 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 From 791c68a8cd869f3715d17d0b09354b43bbffeebf Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Thu, 29 Oct 2020 16:55:46 +0000 Subject: [PATCH 2/6] change nceppost to upp --- io/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt index a45608354..4cbaeb678 100644 --- 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) From 3077139820dc53d34e23ca5e21a0e6c9317bfede Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Thu, 12 Nov 2020 16:22:37 +0000 Subject: [PATCH 3/6] add dycore change #35 --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index ebc59dd70..c070cb6aa 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit ebc59dd7015c07efb1a81d2afed292be7119653c +Subproject commit c070cb6aaf6f730f441bff0708f09dc7e4358929 From f0e9d386aa0aa66953c9b51eccc3c6baf17c63ed Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Thu, 12 Nov 2020 11:28:25 -0600 Subject: [PATCH 4/6] merge with top of dev/emc dycore branch --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index c070cb6aa..39ab35dfb 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit c070cb6aaf6f730f441bff0708f09dc7e4358929 +Subproject commit 39ab35dfb02537b8e3294d3de189e2ea5634815e From ff04f47abc9271d2a679975c370dd02678a7a0e8 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Fri, 13 Nov 2020 08:31:54 -0600 Subject: [PATCH 5/6] remove duplicate read_data in fms_mod in external_ic.F90 --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 39ab35dfb..204f1ca95 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 39ab35dfb02537b8e3294d3de189e2ea5634815e +Subproject commit 204f1ca951556df84f1613e97cc5ee79831e310f From 060f3d6222034fe5a4dad081f345ab0395d0e0d5 Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Tue, 17 Nov 2020 20:25:44 +0000 Subject: [PATCH 6/6] point dycore to dev/emc --- .gitmodules | 4 ++-- atmos_cubed_sphere | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index aae73b3f4..d253f6966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/junwang-noaa/GFDL_atmos_cubed_sphere - branch = gfsv16_dzmin + url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere + branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 204f1ca95..61875852b 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 204f1ca951556df84f1613e97cc5ee79831e310f +Subproject commit 61875852b52951f6c6215603a19c826b952fc534