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

Merge GFDL FV3 Dynamic core (the 201912 release version) #63

Closed
wants to merge 9 commits into from
Closed

Merge GFDL FV3 Dynamic core (the 201912 release version) #63

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
7640a5b
point atmos_cubed_sphere to personal fork and branch
XiaqiongZhou-NOAA Jan 27, 2020
9459a1d
moved atmos_cubed_sphere to dev/emc_nest branch
XiaqiongZhou-NOAA Jan 27, 2020
860240f
Change 'mytile' to 'mygrid' corresponding to the change in atmos_cube…
XiaqiongZhou-NOAA Jan 27, 2020
c332af2
Point atmos_cubed_sphere to new version
XiaqiongZhou-NOAA Jan 30, 2020
327bfab
ponit submodule ccpp-physics to personal fork
XiaqiongZhou-NOAA Jan 31, 2020
ed597ec
point to new version
XiaqiongZhou-NOAA Jan 31, 2020
caf40a4
update ccpp/physics and atmos_cubed_sphere
XiaqiongZhou-NOAA Feb 3, 2020
269c9e8
Merge remote-tracking branch 'remotes/emc/develop' into develop
XiaqiongZhou-NOAA Feb 13, 2020
6137c6c
point to new version
XiaqiongZhou-NOAA Feb 13, 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
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[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/XiaqiongZhou-NOAA/GFDL_atmos_cubed_sphere
branch = dev/emc_nest
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = master
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
url = https://github.com/XiaqiongZhou-NOAA/ccpp-physics
branch = master
2 changes: 1 addition & 1 deletion atmos_cubed_sphere
Open in desktop
Submodule atmos_cubed_sphere updated 38 files
+1 −2 README.md
+416 −318 driver/fvGFS/atmosphere.F90
+7 −7 model/a2b_edge.F90
+776 −182 model/boundary.F90
+190 −83 model/dyn_core.F90
+225 −175 model/fv_arrays.F90
+2 −2 model/fv_cmp.F90
+988 −1,111 model/fv_control.F90
+56 −56 model/fv_dynamics.F90
+3 −3 model/fv_fill.F90
+451 −49 model/fv_grid_utils.F90
+63 −45 model/fv_mapz.F90
+2,329 −823 model/fv_nesting.F90
+5,443 −5,271 model/fv_regional_bc.F90
+3 −3 model/fv_sg.F90
+822 −839 model/fv_tracer2d.F90
+113 −382 model/fv_update_phys.F90
+4 −6 model/nh_core.F90
+2,218 −2,461 model/nh_utils.F90
+3,372 −3,379 model/sw_core.F90
+1,242 −1,241 model/tp_core.F90
+3,905 −4,285 tools/external_ic.F90
+906 −149 tools/fv_diagnostics.F90
+554 −1,175 tools/fv_eta.F90
+959 −0 tools/fv_eta.h
+204 −154 tools/fv_grid_tools.F90
+1 −1 tools/fv_iau_mod.F90
+78 −78 tools/fv_io.F90
+71 −450 tools/fv_mp_mod.F90
+8 −9 tools/fv_nudge.F90
+521 −1,038 tools/fv_restart.F90
+56 −52 tools/fv_surf_map.F90
+7 −7 tools/fv_timing.F90
+69 −64 tools/fv_treat_da_inc.F90
+21 −17 tools/init_hydro.F90
+7 −7 tools/sim_nc_mod.F90
+7 −7 tools/sorted_index.F90
+4,038 −3,661 tools/test_cases.F90
10 changes: 5 additions & 5 deletions atmos_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ module atmos_model_mod
use atmosphere_mod, only: atmosphere_scalar_field_halo
use atmosphere_mod, only: atmosphere_get_bottom_layer
use atmosphere_mod, only: set_atmosphere_pelist
use atmosphere_mod, only: Atm, mytile
use atmosphere_mod, only: Atm, mygrid
use block_control_mod, only: block_control_type, define_blocks_packed
use DYCORE_typedefs, only: DYCORE_data_type, DYCORE_diag_type
#ifdef CCPP
Expand Down Expand Up @@ -599,8 +599,8 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
Init_parm%area => Atmos%area
Init_parm%tracer_names => tracer_names
#ifdef CCPP
Init_parm%restart = Atm(mytile)%flagstruct%warm_start
Init_parm%hydrostatic = Atm(mytile)%flagstruct%hydrostatic
Init_parm%restart = Atm(mygrid)%flagstruct%warm_start
Init_parm%hydrostatic = Atm(mygrid)%flagstruct%hydrostatic
#endif

#ifdef INTERNAL_FILE_NML
Expand Down Expand Up @@ -663,7 +663,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
Atm_block%blksz(1))
endif

Atm(mytile)%flagstruct%do_skeb = IPD_Control%do_skeb
Atm(mygrid)%flagstruct%do_skeb = IPD_Control%do_skeb

! initialize the IAU module
call iau_initialize (IPD_Control,IAU_data,Init_parm)
Expand All @@ -684,7 +684,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
call FV3GFS_diag_register (IPD_Diag, Time, Atm_block, IPD_Control, Atmos%lon, Atmos%lat, Atmos%axes)
call IPD_initialize_rst (IPD_Control, IPD_Data, IPD_Diag, IPD_Restart, Init_parm)
#ifdef CCPP
call FV3GFS_restart_read (IPD_Data, IPD_Restart, Atm_block, IPD_Control, Atmos%domain, Atm(mytile)%flagstruct%warm_start)
call FV3GFS_restart_read (IPD_Data, IPD_Restart, Atm_block, IPD_Control, Atmos%domain, Atm(mygrid)%flagstruct%warm_start)
#else
call FV3GFS_restart_read (IPD_Data, IPD_Restart, Atm_block, IPD_Control, Atmos%domain)
#endif
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 1 files
+4 −4 physics/gfdl_fv_sat_adj.F90