Merge pull request #12 from sit23/master

Cleaning up test case scripts.
ExeClim · Oct 26, 2017 · 0da4af4 · 0da4af4
2 parents b483438 + c6fd6f5
commit 0da4af4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 32 deletions.
diff --git a/exp/test_cases/bucket_hydrology/bucket_model_test_case.py b/exp/test_cases/bucket_hydrology/bucket_model_test_case.py
@@ -7,7 +7,7 @@
 base_dir=os.getcwd()
 GFDL_BASE        = os.environ['GFDL_BASE']
 
-baseexp = Experiment('bucket_test_experiment_3', overwrite_data=False)
+baseexp = Experiment('bucket_test_experiment', overwrite_data=False)
 
 #Add any input files that are necessary for a particular experiment.
 baseexp.inputfiles = [os.path.join(base_dir,'input/land.nc'),os.path.join(GFDL_BASE,'input/rrtm_input_files/ozone_1990.nc')]

diff --git a/exp/test_cases/top_down_test/top_down_test.py b/exp/test_cases/top_down_test/top_down_test.py
@@ -5,18 +5,9 @@
 
 baseexp = Experiment('top_down_test', overwrite_data=True)
 
-#s Define input files for experiment - by default they are found in exp_dir/input/
-
-
-#s Define srcmods - by default they are found in exp_dir/srcmods/
-
 diag = DiagTable()
 
-#diag.add_file('atmos_hourly', 1, 'hours', time_units='days')
-#diag.add_file('atmos_hourly_mk2', 1, 'hours', time_units='days')
 diag.add_file('atmos_daily', 1, 'days', time_units='days')
-#diag.add_file('atmos_daily_mk2', 1, 'days', time_units='days')
-
 
 # Define diag table entries 
 
@@ -28,42 +19,24 @@
 diag.add_field('dynamics', 'ucomp', time_avg=True, files=['atmos_daily'])
 diag.add_field('dynamics', 'vcomp', time_avg=True, files=['atmos_daily'])
 diag.add_field('dynamics', 'temp', time_avg=True, files=['atmos_daily'])
-diag.add_field('atmosphere', 'rh', time_avg=True, files=['atmos_daily'])
 diag.add_field('dynamics', 'slp', time_avg=True, files=['atmos_daily'])
 diag.add_field('dynamics', 'omega', time_avg=True, files=['atmos_daily'])
 diag.add_field('dynamics', 'height', time_avg=True, files=['atmos_daily'])
 diag.add_field('dynamics', 'height_half', time_avg=True, files=['atmos_daily'])
 
-diag.add_field('atmosphere', 'convection_rain', time_avg=True, files=['atmos_daily'])
-diag.add_field('atmosphere', 'condensation_rain', time_avg=True, files=['atmos_daily'])
-
-
-diag.add_field('damping', 'udt_rdamp', time_avg=True, files=['atmos_daily'])
-diag.add_field('damping', 'vdt_rdamp', time_avg=True, files=['atmos_daily'])
-diag.add_field('damping', 'tdt_diss_rdamp', time_avg=True, files=['atmos_daily'])
-
-diag.add_field('vert_turb', 'z_pbl', time_avg=True, files=['atmos_daily'])
-
 diag.add_field('hs_forcing', 'teq', time_avg=True, files=['atmos_daily'])
 diag.add_field('hs_forcing', 'h_trop', time_avg=True, files=['atmos_daily'])
 
 baseexp.use_diag_table(diag)
 
+#Turn off the full, slow radiation scheme compilation
+
+baseexp.disable_rrtm()
+
 baseexp.compile()
 
 baseexp.clear_rundir()
 
-#s Namelist changes from default values
-# baseexp.namelist['main_nml'] = {
-     # 'days'   : 1,	
-     # 'hours'  : 0,
-     # 'minutes': 0,
-     # 'seconds': 0,			
-     # 'dt_atmos':720,
-     # 'current_date' : [0001,1,1,0,0,0],
-     # 'calendar' : 'thirty_day'
-# }
-
 baseexp.namelist['spectral_dynamics_nml'] = {
 	'num_levels': 30,
 	'exponent': 2.5,