Skip to content

Update Shoebox with GFDL fork #675

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

Closed
hlkong wants to merge 40 commits into from
Closed

Update Shoebox with GFDL fork #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
41a2f27
modified: config_src/solo_driver/MOM_surface_forcing.F90
hlkong Dec 10, 2017
10c0de3
modified: src/initialization/MOM_state_initialization.F90
hlkong Dec 10, 2017
291e7d3
modified: src/initialization/MOM_state_initialization.F90
hlkong Dec 10, 2017
71840a8
modified: src/user/channel3_initialization.F90
hlkong Dec 10, 2017
84b5dbd
modified: src/user/channel3_initialization.F90
hlkong Dec 12, 2017
329f648
modified: src/user/channel_initialization.F90
hlkong Dec 12, 2017
296c8c4
modified: config_src/solo_driver/MOM_surface_forcing.F90
hlkong Dec 14, 2017
e2a38c3
modified: config_src/solo_driver/channel2_surface_forcing.F90
hlkong Dec 24, 2017
ee828f9
modified: config_src/solo_driver/shoebox_surface_forcing.F90
hlkong Dec 24, 2017
e176084
modified: src/initialization/MOM_fixed_initialization.F90
hlkong Dec 26, 2017
c239823
Merge pull request #1 from NOAA-GFDL/dev/gfdl
hlkong Dec 26, 2017
cf5d6b6
Merge branch 'shoebox' of https://github.com/hlkong/MOM6 into shoebox
hlkong Dec 26, 2017
8b06441
modified: src/user/shoebox0_initialization.F90
hlkong Dec 30, 2017
237ef68
modified: config_src/solo_driver/MOM_surface_forcing.F90
hlkong Jan 3, 2018
9eccea6
modified: config_src/solo_driver/MOM_surface_forcing.F90
hlkong Jan 9, 2018
4f59624
Merge branch 'dev/gfdl' into shoebox
hlkong Jan 9, 2018
8c3b7dc
modified: config_src/solo_driver/channel3_surface_forcing.F90
hlkong Jan 10, 2018
7e02a2d
Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into dev…
hlkong Jan 10, 2018
a9b95d1
Merge branch 'dev/gfdl' into shoebox
hlkong Jan 10, 2018
d661a91
modified: config_src/solo_driver/MOM_surface_forcing.F90
hlkong Jan 11, 2018
fef0e6e
modified: config_src/solo_driver/MOM_surface_forcing.F90
hlkong Jan 30, 2018
675fb8b
Merge branch 'dev/gfdl' into shoebox
hlkong Jan 30, 2018
e7ed156
Merge branch 'shoebox' of https://github.com/hlkong/MOM6 into shoebox
hlkong Jan 30, 2018
b429830
modified: config_src/solo_driver/MOM_surface_forcing.F90
hlkong Jan 30, 2018
8863b84
Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into dev…
hlkong Jan 30, 2018
6f78f54
Merge branch 'dev/gfdl' into shoebox
hlkong Jan 30, 2018
fb2218f
modified: config_src/solo_driver/MOM_surface_forcing.F90
hlkong Feb 6, 2018
34d9c31
modified: src/initialization/MOM_state_initialization.F90
hlkong Feb 21, 2018
a9b5f2e
modified: src/initialization/MOM_state_initialization.F90
hlkong Feb 27, 2018
1f6500d
Merge branch 'dev/gfdl' into shoebox
hlkong Feb 27, 2018
dd85f85
modified: src/initialization/MOM_fixed_initialization.F90
hlkong Mar 7, 2018
1fbccb1
Merge branch 'dev/gfdl' into shoebox
hlkong Mar 7, 2018
4bc7683
modified: src/parameterizations/vertical/MOM_vert_friction.F90
hlkong Mar 7, 2018
e80c14b
modified: src/parameterizations/vertical/MOM_vert_friction.F90
hlkong Mar 8, 2018
bbcef36
modified: src/user/channel6_initialization.F90
hlkong Apr 5, 2018
d4687a5
Merge branch 'dev/gfdl' into shoebox
hlkong Apr 5, 2018
3c67ccc
Merge branch 'dev/gfdl' into shoebox
hlkong Apr 25, 2018
481d92e
modified: src/core/MOM.F90
hlkong Jul 11, 2018
2c87387
Merge branch 'dev/gfdl' into shoebox
hlkong Jul 11, 2018
77c2915
modified: pkg/CVMix-src
hlkong Jul 11, 2018
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
117 changes: 117 additions & 0 deletions config_src/solo_driver/MOM_surface_forcing.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,32 @@ module MOM_surface_forcing
use MESO_surface_forcing, only : MESO_surface_forcing_init, MESO_surface_forcing_CS
use Neverland_surface_forcing, only : Neverland_wind_forcing, Neverland_buoyancy_forcing
use Neverland_surface_forcing, only : Neverland_surface_forcing_init, Neverland_surface_forcing_CS
use shoebox_surface_forcing, only : shoebox_wind_forcing, shoebox_buoyancy_forcing
use shoebox_surface_forcing, only : shoebox_surface_forcing_init, shoebox_surface_forcing_CS
use shoebox3_surface_forcing, only : shoebox3_buoyancy_forcing, shoebox3_wind_forcing
use shoebox3_surface_forcing, only : shoebox3_surface_forcing_init, shoebox3_surface_forcing_CS
use shoebox4_surface_forcing, only : shoebox4_buoyancy_forcing, shoebox4_wind_forcing
use shoebox4_surface_forcing, only : shoebox4_surface_forcing_init, shoebox4_surface_forcing_CS
use shoebox5_surface_forcing, only : shoebox5_buoyancy_forcing, shoebox5_wind_forcing
use shoebox5_surface_forcing, only : shoebox5_surface_forcing_init, shoebox5_surface_forcing_CS
use shoebox8_surface_forcing, only : shoebox8_buoyancy_forcing,shoebox8_wind_forcing
use shoebox8_surface_forcing, only : shoebox8_surface_forcing_init, shoebox8_surface_forcing_CS
use shoebox9_surface_forcing, only : shoebox9_buoyancy_forcing, shoebox9_wind_forcing
use shoebox9_surface_forcing, only : shoebox9_surface_forcing_init, shoebox9_surface_forcing_CS
use channel_surface_forcing, only : channel_wind_forcing, channel_buoyancy_forcing
use channel_surface_forcing, only : channel_surface_forcing_init, channel_surface_forcing_CS
use channel2_surface_forcing, only : channel2_wind_forcing, channel2_buoyancy_forcing
use channel2_surface_forcing, only : channel2_surface_forcing_init, channel2_surface_forcing_CS
use channel3_surface_forcing, only : channel3_wind_forcing, channel3_buoyancy_forcing
use channel3_surface_forcing, only : channel3_surface_forcing_init, channel3_surface_forcing_CS
use channel4_surface_forcing, only : channel4_wind_forcing, channel4_buoyancy_forcing
use channel4_surface_forcing, only : channel4_surface_forcing_init, channel4_surface_forcing_CS
use channel5_surface_forcing, only : channel5_wind_forcing, channel5_buoyancy_forcing
use channel5_surface_forcing, only : channel5_surface_forcing_init, channel5_surface_forcing_CS
use channel6_surface_forcing, only : channel6_wind_forcing, channel6_buoyancy_forcing
use channel6_surface_forcing, only : channel6_surface_forcing_init, channel6_surface_forcing_CS
use channel7_surface_forcing, only : channel7_wind_forcing, channel7_buoyancy_forcing
use channel7_surface_forcing, only : channel7_surface_forcing_init, channel7_surface_forcing_CS
use user_surface_forcing, only : USER_wind_forcing, USER_buoyancy_forcing
use user_surface_forcing, only : USER_surface_forcing_init, user_surface_forcing_CS
use user_revise_forcing, only : user_alter_forcing, user_revise_forcing_init
Expand Down Expand Up @@ -199,6 +225,19 @@ module MOM_surface_forcing
type(dumbbell_surface_forcing_CS), pointer :: dumbbell_forcing_CSp => NULL()
type(MESO_surface_forcing_CS), pointer :: MESO_forcing_CSp => NULL()
type(Neverland_surface_forcing_CS), pointer :: Neverland_forcing_CSp => NULL()
type(shoebox_surface_forcing_CS), pointer :: shoebox_forcing_CSp => NULL()
type(shoebox3_surface_forcing_CS), pointer :: shoebox3_forcing_CSp => NULL()
type(shoebox4_surface_forcing_CS), pointer :: shoebox4_forcing_CSp => NULL()
type(shoebox5_surface_forcing_CS), pointer :: shoebox5_forcing_CSp => NULL()
type(shoebox8_surface_forcing_CS), pointer :: shoebox8_forcing_CSp => NULL()
type(shoebox9_surface_forcing_CS), pointer :: shoebox9_forcing_CSp => NULL()
type(channel_surface_forcing_CS), pointer :: channel_forcing_CSp => NULL()
type(channel2_surface_forcing_CS), pointer :: channel2_forcing_CSp => NULL()
type(channel3_surface_forcing_CS), pointer :: channel3_forcing_CSp => NULL()
type(channel4_surface_forcing_CS), pointer :: channel4_forcing_CSp => NULL()
type(channel5_surface_forcing_CS), pointer :: channel5_forcing_CSp => NULL()
type(channel6_surface_forcing_CS), pointer :: channel6_forcing_CSp => NULL()
type(channel7_surface_forcing_CS), pointer :: channel7_forcing_CSp => NULL()
type(SCM_idealized_hurricane_CS), pointer :: SCM_idealized_hurricane_CSp => NULL()
type(SCM_CVmix_tests_CS), pointer :: SCM_CVmix_tests_CSp => NULL()
!!@}
Expand Down Expand Up @@ -279,6 +318,32 @@ subroutine set_forcing(sfc_state, forces, fluxes, day_start, day_interval, G, CS
call MESO_wind_forcing(sfc_state, forces, day_center, G, CS%MESO_forcing_CSp)
elseif (trim(CS%wind_config) == "Neverland") then
call Neverland_wind_forcing(sfc_state, forces, day_center, G, CS%Neverland_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox") then
call shoebox_wind_forcing(sfc_state, forces, day_center, G, CS%shoebox_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox3") then
call shoebox3_wind_forcing(sfc_state, forces, day_center, G, CS%shoebox3_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox4") then
call shoebox4_wind_forcing(sfc_state, forces, day_center, G, CS%shoebox4_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox5") then
call shoebox5_wind_forcing(sfc_state, forces, day_center, G, CS%shoebox5_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox8") then
call shoebox8_wind_forcing(sfc_state, forces, day_center, G, CS%shoebox8_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox9") then
call shoebox9_wind_forcing(sfc_state, forces, day_center, G, CS%shoebox9_forcing_CSp)
elseif (trim(CS%wind_config) == "channel") then
call channel_wind_forcing(sfc_state, forces, day_center, G, CS%channel_forcing_CSp)
elseif (trim(CS%wind_config) == "channel2") then
call channel2_wind_forcing(sfc_state, forces, day_center, G, CS%channel2_forcing_CSp)
elseif (trim(CS%wind_config) == "channel3") then
call channel3_wind_forcing(sfc_state, forces, day_center, G, CS%channel3_forcing_CSp)
elseif (trim(CS%wind_config) == "channel4") then
call channel4_wind_forcing(sfc_state, forces, day_center, G, CS%channel4_forcing_CSp)
elseif (trim(CS%wind_config) == "channel5") then
call channel5_wind_forcing(sfc_state, forces, day_center, G, CS%channel5_forcing_CSp)
elseif (trim(CS%wind_config) == "channel6") then
call channel6_wind_forcing(sfc_state, forces, day_center, G, CS%channel6_forcing_CSp)
elseif (trim(CS%wind_config) == "channel7") then
call channel7_wind_forcing(sfc_state, forces, day_center, G, CS%channel7_forcing_CSp)
elseif (trim(CS%wind_config) == "SCM_ideal_hurr") then
call SCM_idealized_hurricane_wind_forcing(sfc_state, forces, day_center, G, CS%SCM_idealized_hurricane_CSp)
elseif (trim(CS%wind_config) == "SCM_CVmix_tests") then
Expand Down Expand Up @@ -311,6 +376,32 @@ subroutine set_forcing(sfc_state, forces, fluxes, day_start, day_interval, G, CS
call MESO_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%MESO_forcing_CSp)
elseif (trim(CS%buoy_config) == "Neverland") then
call Neverland_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%Neverland_forcing_CSp)
elseif (trim(CS%buoy_config) == "shoebox") then
call shoebox_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%shoebox_forcing_CSp)
elseif (trim(CS%buoy_config) == "shoebox3") then
call shoebox3_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%shoebox3_forcing_CSp)
elseif (trim(CS%buoy_config) == "shoebox4") then
call shoebox4_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%shoebox4_forcing_CSp)
elseif (trim(CS%buoy_config) == "shoebox5") then
call shoebox5_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%shoebox5_forcing_CSp)
elseif (trim(CS%buoy_config) == "shoebox8") then
call shoebox8_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%shoebox8_forcing_CSp)
elseif (trim(CS%buoy_config) == "shoebox9") then
call shoebox9_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%shoebox9_forcing_CSp)
elseif (trim(CS%buoy_config) == "channel") then
call channel_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%channel_forcing_CSp)
elseif (trim(CS%buoy_config) == "channel2") then
call channel2_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%channel2_forcing_CSp)
elseif (trim(CS%buoy_config) == "channel3") then
call channel3_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%channel3_forcing_CSp)
elseif (trim(CS%buoy_config) == "channel4") then
call channel4_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%channel4_forcing_CSp)
elseif (trim(CS%buoy_config) == "channel5") then
call channel5_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%channel5_forcing_CSp)
elseif (trim(CS%buoy_config) == "channel6") then
call channel6_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%channel6_forcing_CSp)
elseif (trim(CS%buoy_config) == "channel7") then
call channel7_buoyancy_forcing(sfc_state, fluxes, day_center, dt, G, CS%channel7_forcing_CSp)
elseif (trim(CS%buoy_config) == "SCM_CVmix_tests") then
call SCM_CVmix_tests_buoyancy_forcing(sfc_state, fluxes, day_center, G, CS%SCM_CVmix_tests_CSp)
elseif (trim(CS%buoy_config) == "USER") then
Expand Down Expand Up @@ -1704,6 +1795,32 @@ subroutine surface_forcing_init(Time, G, param_file, diag, CS, tracer_flow_CSp)
call MESO_surface_forcing_init(Time, G, param_file, diag, CS%MESO_forcing_CSp)
elseif (trim(CS%wind_config) == "Neverland") then
call Neverland_surface_forcing_init(Time, G, param_file, diag, CS%Neverland_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox") then
call shoebox_surface_forcing_init(Time, G, param_file, diag, CS%shoebox_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox3") then
call shoebox3_surface_forcing_init(Time, G, param_file, diag, CS%shoebox3_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox4") then
call shoebox4_surface_forcing_init(Time, G, param_file, diag, CS%shoebox4_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox5") then
call shoebox5_surface_forcing_init(Time, G, param_file, diag, CS%shoebox5_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox8") then
call shoebox8_surface_forcing_init(Time, G, param_file, diag, CS%shoebox8_forcing_CSp)
elseif (trim(CS%wind_config) == "shoebox9") then
call shoebox9_surface_forcing_init(Time, G, param_file, diag, CS%shoebox9_forcing_CSp)
elseif (trim(CS%wind_config) == "channel") then
call channel_surface_forcing_init(Time, G, param_file, diag, CS%channel_forcing_CSp)
elseif (trim(CS%wind_config) == "channel2") then
call channel2_surface_forcing_init(Time, G, param_file, diag, CS%channel2_forcing_CSp)
elseif (trim(CS%wind_config) == "channel3") then
call channel3_surface_forcing_init(Time, G, param_file, diag, CS%channel3_forcing_CSp)
elseif (trim(CS%wind_config) == "channel4") then
call channel4_surface_forcing_init(Time, G, param_file, diag, CS%channel4_forcing_CSp)
elseif (trim(CS%wind_config) == "channel5") then
call channel5_surface_forcing_init(Time, G, param_file, diag, CS%channel5_forcing_CSp)
elseif (trim(CS%wind_config) == "channel6") then
call channel6_surface_forcing_init(Time, G, param_file, diag, CS%channel6_forcing_CSp)
elseif (trim(CS%wind_config) == "channel7") then
call channel7_surface_forcing_init(Time, G, param_file, diag, CS%channel7_forcing_CSp)
elseif (trim(CS%wind_config) == "SCM_ideal_hurr") then
call SCM_idealized_hurricane_wind_init(Time, G, param_file, CS%SCM_idealized_hurricane_CSp)
elseif (trim(CS%wind_config) == "const") then
Expand Down
Loading