Skip to content

Commit

Permalink
Merge pull request #219 from grantfirl/update_output
Browse files Browse the repository at this point in the history 
Streamline SCM output
  • Loading branch information
@grantfirl
grantfirl authored Jan 8, 2021
2 parents 29ef750 + a0d746d commit 08614f8
Show file tree
Hide file tree
Showing 65 changed files with 2,033 additions and 1,138 deletions.
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 39 files
+2 −0 README.md
+1 −1 physics/GFS_debug.F90
+3 −3 physics/GFS_phys_time_vary.scm.F90
+192 −0 physics/GFS_rrtmgp_cloud_overlap_pre.F90
+265 −0 physics/GFS_rrtmgp_cloud_overlap_pre.meta
+51 −168 physics/GFS_rrtmgp_gfdlmp_pre.F90
+45 −166 physics/GFS_rrtmgp_gfdlmp_pre.meta
+11 −9 physics/GFS_rrtmgp_lw_post.F90
+15 −6 physics/GFS_rrtmgp_lw_post.meta
+51 −19 physics/GFS_rrtmgp_pre.F90
+37 −11 physics/GFS_rrtmgp_pre.meta
+7 −7 physics/GFS_rrtmgp_sw_post.F90
+16 −16 physics/GFS_rrtmgp_sw_post.meta
+9 −11 physics/GFS_rrtmgp_sw_pre.F90
+15 −6 physics/GFS_rrtmgp_sw_pre.meta
+282 −0 physics/GFS_rrtmgp_thompsonmp_pre.F90
+442 −0 physics/GFS_rrtmgp_thompsonmp_pre.meta
+34 −61 physics/GFS_suite_interstitial.F90
+11 −47 physics/GFS_suite_interstitial.meta
+1 −0 physics/GFS_surface_composites.F90
+34 −29 physics/dcyc2.f
+36 −1 physics/dcyc2.meta
+1 −1 physics/drag_suite.F90
+0 −49 physics/module_SGSCloud_RadPre.F90
+40 −28 physics/rrtmgp_lw_cloud_optics.F90
+11 −3 physics/rrtmgp_lw_cloud_optics.meta
+16 −11 physics/rrtmgp_lw_cloud_sampling.F90
+12 −4 physics/rrtmgp_lw_cloud_sampling.meta
+3 −3 physics/rrtmgp_lw_gas_optics.F90
+1 −1 physics/rrtmgp_lw_gas_optics.meta
+5 −4 physics/rrtmgp_lw_pre.F90
+12 −3 physics/rrtmgp_lw_pre.meta
+80 −46 physics/rrtmgp_lw_rte.F90
+21 −49 physics/rrtmgp_lw_rte.meta
+6 −3 physics/rrtmgp_sampling.F90
+16 −11 physics/rrtmgp_sw_cloud_optics.F90
+2 −2 physics/rrtmgp_sw_cloud_sampling.F90
+1 −1 physics/rte-rrtmgp
+2 −1 physics/unified_ugwp.F90
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v15p2.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_ACM.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_FA.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_MYJ.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_RRTMGP.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_RRTMGP_LWjac.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_YSU.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_noahmp.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v15p2_saYSU.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v16beta.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v16beta_RRTMGP.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GFS_v16beta_RRTMGP_LWjac.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_GSD_v1.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_HAFS_v0_hwrf.nml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
ldiag3d = .true.
qdiag3d = .true.
fhcyc = 0
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_HAFS_v0_hwrf_thompson.nml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
ldiag3d = .true.
qdiag3d = .true.
fhcyc = 0
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_RRFS_v1beta.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
fhcyc = 0.0
fhlwr = 1200.0
fhswr = 1200.0
fhzero = 1.0
fhzero = 0.16667
h2o_phys = .true.
hybedmf = .false.
iaer = 111
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_csawmg.nml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
&gfs_physics_nml
fhzero = 6.
fhzero = 0.16667
ldiag3d = .true.
qdiag3d = .true.
fhcyc = 24.
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_2016051812.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_2016051812',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_2016051812_MSDA.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_2016051812_MSDA',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_2016051812_VARA.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_2016051812_VARA',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180514_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180514_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180522_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180522_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180606_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180606_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180618_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180618_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180619_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180619_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180705_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180705_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180707_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180707_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180709_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180709_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180712_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180712_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180731_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180731_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180911_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180911_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180914_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180914_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180916_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180916_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180917_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180917_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20180918_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20180918_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/LASSO_20181002_s02.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'LASSO_20181002_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/arm_sgp_summer_1997_A.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'arm_sgp_summer_1997_A',
dt = 600.0,
time_scheme = 1,
runtime = 345600,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/arm_sgp_summer_1997_B.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'arm_sgp_summer_1997_B',
dt = 600.0,
time_scheme = 1,
runtime = 432000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/arm_sgp_summer_1997_C.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'arm_sgp_summer_1997_C',
dt = 600.0,
time_scheme = 1,
runtime = 432000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/arm_sgp_summer_1997_R.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'arm_sgp_summer_1997_R',
dt = 600.0,
time_scheme = 1,
runtime = 345600,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/arm_sgp_summer_1997_S.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'arm_sgp_summer_1997_S',
dt = 600.0,
time_scheme = 1,
runtime = 345600,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/arm_sgp_summer_1997_T.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'arm_sgp_summer_1997_T',
dt = 600.0,
time_scheme = 1,
runtime = 259200,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/arm_sgp_summer_1997_U.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'arm_sgp_summer_1997_U',
dt = 600.0,
time_scheme = 1,
runtime = 345600,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/arm_sgp_summer_1997_X.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'arm_sgp_summer_1997_X',
dt = 600.0,
time_scheme = 1,
runtime = 2505600,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/astex.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'astex',
dt = 600.0,
time_scheme = 1,
runtime = 144000,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/bomex.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'bomex',
dt = 600.0,
time_scheme = 1,
runtime = 21600,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/case_config/default.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ case_name = 'twpice',
dt = 600.0,
time_scheme = 1,
runtime = 2138400,
output_frequency = 600.0,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
Expand Down
Loading

0 comments on commit 08614f8

Please sign in to comment.