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

Codecleanup3 #111

Merged
merged 9 commits into from
Jan 30, 2018
Merged

Codecleanup3 #111

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
0e44d88
bug fix: remove redundant bgc_data_type declaration
eclare108213 Jan 27, 2018
c429e35
move oceanmixed_ice flag from icedrv_arrays_column.F90 to icedrv_forc…
eclare108213 Jan 27, 2018
27a5819
rm bgc diagnostic arrays, clean up
eclare108213 Jan 28, 2018
7b244a3
cleaned up icedrv_flux.F90
eclare108213 Jan 28, 2018
52e0086
clean up icedrv_forcing.F90
eclare108213 Jan 28, 2018
529a96a
include aday, atime but commented out for documentation purposes
eclare108213 Jan 29, 2018
12a569c
mostly cosmetic, but ISPOL restart now works?!
eclare108213 Jan 29, 2018
4008185
moved icepack_constants.F90 into icepack_parameters.F90
eclare108213 Jan 30, 2018
39e5fcc
Merge branch 'master' into codecleanup3
apcraig Jan 30, 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
4 changes: 2 additions & 2 deletions columnphysics/icepack_aerosol.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
module icepack_aerosol

use icepack_kinds
use icepack_constants, only: c0, c1, c2, puny, rhoi, rhos, hs_min
use icepack_constants, only: hi_ssl, hs_ssl
use icepack_parameters, only: c0, c1, c2, puny, rhoi, rhos, hs_min
use icepack_parameters, only: hi_ssl, hs_ssl
use icepack_tracers, only: nt_aero, max_aero
use icepack_warnings, only: warnstr, icepack_warnings_add
use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted
Expand Down
6 changes: 3 additions & 3 deletions columnphysics/icepack_algae.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ module icepack_algae

use icepack_kinds

use icepack_constants, only: p05, p1, p5, c0, c1, c2, c4, c6, c10
use icepack_constants, only: pi, secday, puny
use icepack_constants, only: hi_ssl, hs_ssl, sk_l
use icepack_parameters, only: p05, p1, p5, c0, c1, c2, c4, c6, c10
use icepack_parameters, only: pi, secday, puny
use icepack_parameters, only: hi_ssl, hs_ssl, sk_l

use icepack_parameters, only: dEdd_algae, solve_zbgc
use icepack_parameters, only: R_dFe2dust, dustFe_sol, algal_vel
Expand Down
10 changes: 5 additions & 5 deletions columnphysics/icepack_atmo.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
module icepack_atmo

use icepack_kinds
use icepack_constants, only: c0, c1, c2, c4, c5, c8, c10
use icepack_constants, only: c16, c20, p001, p01, p2, p4, p5, p75, puny
use icepack_constants, only: cp_wv, cp_air, iceruf, zref, qqqice, TTTice, qqqocn, TTTocn
use icepack_constants, only: Lsub, Lvap, vonkar, Tffresh, zvir, gravit
use icepack_constants, only: pih, dragio, rhoi, rhos, rhow
use icepack_parameters, only: c0, c1, c2, c4, c5, c8, c10
use icepack_parameters, only: c16, c20, p001, p01, p2, p4, p5, p75, puny
use icepack_parameters, only: cp_wv, cp_air, iceruf, zref, qqqice, TTTice, qqqocn, TTTocn
use icepack_parameters, only: Lsub, Lvap, vonkar, Tffresh, zvir, gravit
use icepack_parameters, only: pih, dragio, rhoi, rhos, rhow
use icepack_parameters, only: atmbndy, calc_strair, formdrag
use icepack_parameters, only: highfreq, natmiter
use icepack_warnings, only: warnstr, icepack_warnings_add
Expand Down
6 changes: 3 additions & 3 deletions columnphysics/icepack_brine.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
module icepack_brine

use icepack_kinds
use icepack_constants, only: p01, p001, p5, c0, c1, c2, c1p5, puny
use icepack_constants, only: gravit, rhoi, rhow, rhos, depressT
use icepack_constants, only: salt_loss, min_salin, rhosi
use icepack_parameters, only: p01, p001, p5, c0, c1, c2, c1p5, puny
use icepack_parameters, only: gravit, rhoi, rhow, rhos, depressT
use icepack_parameters, only: salt_loss, min_salin, rhosi
use icepack_parameters, only: dts_b, l_sk
use icepack_tracers, only: ntrcr, nt_qice, nt_sice, nt_bgc_S
use icepack_tracers, only: nt_fbri, nt_Tsfc
Expand Down
609 changes: 0 additions & 609 deletions columnphysics/icepack_constants.F90
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion columnphysics/icepack_firstyear.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
module icepack_firstyear

use icepack_kinds
use icepack_constants, only: secday, c0
use icepack_parameters, only: secday, c0
use icepack_warnings, only: warnstr, icepack_warnings_add
use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted

Expand Down
2 changes: 1 addition & 1 deletion columnphysics/icepack_flux.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
module icepack_flux

use icepack_kinds
use icepack_constants, only: c1, emissivity
use icepack_parameters, only: c1, emissivity
use icepack_warnings, only: warnstr, icepack_warnings_add
use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted

Expand Down
18 changes: 7 additions & 11 deletions columnphysics/icepack_intfc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,17 @@ module icepack_intfc
use icepack_tracers, only: icepack_max_aero => max_aero
use icepack_tracers, only: icepack_nmodal1 => nmodal1
use icepack_tracers, only: icepack_nmodal2 => nmodal2
use icepack_constants, only: icepack_nspint => nspint

use icepack_constants, only: icepack_init_constants
use icepack_constants, only: icepack_query_constants
use icepack_constants, only: icepack_write_constants
use icepack_constants, only: icepack_recompute_constants
use icepack_constants, only: nspint, secday, spval_const
use icepack_constants, only: c0, c1, c1p5, c2, c3, c4, c5, c6, c8
use icepack_constants, only: c10, c15, c16, c20, c25, c100, c1000
use icepack_constants, only: p001, p01, p1, p2, p4, p5, p6, p05
use icepack_constants, only: p15, p25, p75, p333, p666
use icepack_parameters, only: icepack_nspint => nspint

use icepack_parameters, only: icepack_init_parameters
use icepack_parameters, only: icepack_query_parameters
use icepack_parameters, only: icepack_write_parameters
use icepack_parameters, only: icepack_recompute_constants
use icepack_parameters, only: nspint, secday, spval_const
use icepack_parameters, only: c0, c1, c1p5, c2, c3, c4, c5, c6, c8
use icepack_parameters, only: c10, c15, c16, c20, c25, c100, c1000
use icepack_parameters, only: p001, p01, p1, p2, p4, p5, p6, p05
use icepack_parameters, only: p15, p25, p75, p333, p666

use icepack_tracers, only: icepack_compute_tracers
use icepack_tracers, only: icepack_query_tracer_sizes
Expand Down
6 changes: 3 additions & 3 deletions columnphysics/icepack_itd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
module icepack_itd

use icepack_kinds
use icepack_constants, only: c0, c1, c2, c3, c15, c25, c100, p1, p01, p001, p5, puny
use icepack_constants, only: Lfresh, rhos, ice_ref_salinity, hs_min, cp_ice, Tocnfrz, rhoi
use icepack_constants, only: rhosi, sk_l, hs_ssl, min_salin
use icepack_parameters, only: c0, c1, c2, c3, c15, c25, c100, p1, p01, p001, p5, puny
use icepack_parameters, only: Lfresh, rhos, ice_ref_salinity, hs_min, cp_ice, Tocnfrz, rhoi
use icepack_parameters, only: rhosi, sk_l, hs_ssl, min_salin
use icepack_tracers, only: nt_Tsfc, nt_qice, nt_qsno, nt_aero
use icepack_tracers, only: nt_apnd, nt_hpnd, nt_fbri, tr_brine, nt_bgc_S, bio_index
use icepack_parameters, only: solve_zsal, skl_bgc, z_tracers
Expand Down
6 changes: 3 additions & 3 deletions columnphysics/icepack_mechred.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
module icepack_mechred

use icepack_kinds
use icepack_constants, only: c0, c1, c2, c10, c20, c25, Cf, Cp, Pstar, Cstar
use icepack_constants, only: p05, p15, p25, p333, p5
use icepack_constants, only: puny, Lfresh, rhoi, rhos, rhow, gravit
use icepack_parameters, only: c0, c1, c2, c10, c20, c25, Cf, Cp, Pstar, Cstar
use icepack_parameters, only: p05, p15, p25, p333, p5
use icepack_parameters, only: puny, Lfresh, rhoi, rhos, rhow, gravit

use icepack_parameters, only: kstrength, krdg_partic, krdg_redist, mu_rdg
use icepack_parameters, only: heat_capacity
Expand Down
4 changes: 2 additions & 2 deletions columnphysics/icepack_meltpond_cesm.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
module icepack_meltpond_cesm

use icepack_kinds
use icepack_constants, only: c0, c1, c2, p01, puny
use icepack_constants, only: rhofresh, rhoi, rhos, Timelt
use icepack_parameters, only: c0, c1, c2, p01, puny
use icepack_parameters, only: rhofresh, rhoi, rhos, Timelt
use icepack_warnings, only: warnstr, icepack_warnings_add
use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted

Expand Down
6 changes: 3 additions & 3 deletions columnphysics/icepack_meltpond_lvl.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
module icepack_meltpond_lvl

use icepack_kinds
use icepack_constants, only: c0, c1, c2, c10, p01, p5, puny
use icepack_constants, only: viscosity_dyn, rhoi, rhos, rhow, Timelt, Tffresh, Lfresh
use icepack_constants, only: gravit, depressT, rhofresh, kice
use icepack_parameters, only: c0, c1, c2, c10, p01, p5, puny
use icepack_parameters, only: viscosity_dyn, rhoi, rhos, rhow, Timelt, Tffresh, Lfresh
use icepack_parameters, only: gravit, depressT, rhofresh, kice
use icepack_warnings, only: warnstr, icepack_warnings_add
use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted

Expand Down
6 changes: 3 additions & 3 deletions columnphysics/icepack_meltpond_topo.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
module icepack_meltpond_topo

use icepack_kinds
use icepack_constants, only: c0, c1, c2, p01, p1, p15, p4, p6
use icepack_constants, only: puny, viscosity_dyn, rhoi, rhos, rhow, Timelt, Lfresh
use icepack_constants, only: gravit, depressT, kice, ice_ref_salinity
use icepack_parameters, only: c0, c1, c2, p01, p1, p15, p4, p6
use icepack_parameters, only: puny, viscosity_dyn, rhoi, rhos, rhow, Timelt, Lfresh
use icepack_parameters, only: gravit, depressT, kice, ice_ref_salinity
use icepack_warnings, only: warnstr, icepack_warnings_add
use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted
use icepack_therm_shared, only: calculate_Tin_from_qin
Expand Down
8 changes: 4 additions & 4 deletions columnphysics/icepack_mushy_physics.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module icepack_mushy_physics

use icepack_kinds
use icepack_constants, only: c0, c1, c2, c4, c8, c10, c1000
use icepack_constants, only: p001, p01, p05, p1, p2, p5, pi, bignum, puny, ice_ref_salinity
use icepack_constants, only: viscosity_dyn, rhow, rhoi, rhos, cp_ocn, cp_ice, Lfresh, gravit
use icepack_constants, only: hs_min, ksno
use icepack_parameters, only: c0, c1, c2, c4, c8, c10, c1000
use icepack_parameters, only: p001, p01, p05, p1, p2, p5, pi, bignum, puny, ice_ref_salinity
use icepack_parameters, only: viscosity_dyn, rhow, rhoi, rhos, cp_ocn, cp_ice, Lfresh, gravit
use icepack_parameters, only: hs_min, ksno
use icepack_warnings, only: warnstr, icepack_warnings_add
use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted

Expand Down
4 changes: 2 additions & 2 deletions columnphysics/icepack_ocean.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
module icepack_ocean

use icepack_kinds
use icepack_constants, only: c0, c1, c1000
use icepack_constants, only: cp_ocn, Tffresh, stefan_boltzmann, Lvap, cprho
use icepack_parameters, only: c0, c1, c1000
use icepack_parameters, only: cp_ocn, Tffresh, stefan_boltzmann, Lvap, cprho
use icepack_warnings, only: warnstr, icepack_warnings_add
use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted

Expand Down
2 changes: 1 addition & 1 deletion columnphysics/icepack_orbital.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
module icepack_orbital

use icepack_kinds
use icepack_constants, only: c2, p5, pi, secday
use icepack_parameters, only: c2, p5, pi, secday
use icepack_warnings, only: warnstr, icepack_warnings_add
use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted

Expand Down
Loading