Commit 9c9006e5 authored by Evans, Katherine's avatar Evans, Katherine
Browse files

fix conflicts with Joe fixes

parents d4a2c26e 66f54f11
......@@ -20,7 +20,7 @@ title = "Low cloud cover over Greenland"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_atm_climo_jja = os.path.join(config['cesm_atm_climos'], 'b.e10.BG20TRCN.f09_g16.002_JJA_climo.nc')
f_cesm_atm_climo_jja = os.path.join(config['atm_climos'], 'b.e10.BG20TRCN.f09_g16.002_JJA_climo.nc')
f_isccp = os.path.join(config['cloud_data'], 'ISCCP_ANN_climo.nc')
f_cloudsat = os.path.join(config['cloud_data'], 'CLOUDSAT_ANN_climo.nc')
# --------------------------------------------------------------
......
......@@ -20,7 +20,7 @@ title = "Cloud cover over Greenland"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_atm_climo_jja = os.path.join(config['cesm_atm_climos'], 'b.e10.BG20TRCN.f09_g16.002_JJA_climo.nc')
f_cesm_atm_climo_jja = os.path.join(config['atm_climos'], 'b.e10.BG20TRCN.f09_g16.002_JJA_climo.nc')
f_isccp = os.path.join(config['cloud_data'], 'ISCCP_ANN_climo.nc')
f_cloudsat = os.path.join(config['cloud_data'], 'CLOUDSAT_ANN_climo.nc')
# --------------------------------------------------------------
......
......@@ -28,7 +28,7 @@ def make_plot(config, out_path='.'):
for month in months:
# CESM1
f_cesm = os.path.join(config['cesm_atm_climos'],
f_cesm = os.path.join(config['atm_climos'],
"b.e10.BG20TRCN.f09_g16.002_{:02d}_aavg_climo.nc".format(month))
ncid1 = Dataset(f_cesm, mode='r')
model_cld = ncid1.variables['CLDHGH'][0]
......
......@@ -29,7 +29,7 @@ def make_plot(config, out_path='.'):
for month in months:
# ---------------- Data source at OLCF ------------------------
# CESM1
input_file1 = os.path.join(config['cesm_atm_climos'],
input_file1 = os.path.join(config['atm_climos'],
"b.e10.BG20TRCN.f09_g16.002_{:02d}_aavg_climo.nc".format(month))
ncid1 = Dataset(input_file1, mode='r')
model_cld = ncid1.variables['CLDLOW'][0]
......
......@@ -29,7 +29,7 @@ def make_plot(config, out_path='.'):
for month in months:
# ---------------- Data source at OLCF ------------------------
# CESM1
f_cesm = os.path.join(config['cesm_atm_climos'],
f_cesm = os.path.join(config['atm_climos'],
"b.e10.BG20TRCN.f09_g16.002_{:02d}_aavg_climo.nc".format(month))
ncid1 = Dataset(f_cesm, mode='r')
model_cld = ncid1.variables['CLDTOT'][0]
......
......@@ -2,7 +2,7 @@
"clouds_cesm" : {
"module" : "clouds/clouds_cesm.py",
"references" : "clouds/clouds_model.bib",
"cesm_atm_climos": "data/cesm/atm",
"atm_climos": "data/cesm/atm",
"cism_data": "data/cism/glissade",
"cloud_data": "data/obs_clouds",
"image_height" : 300
......
......@@ -2,7 +2,7 @@
"clouds_e3sm" : {
"module" : "clouds/clouds_e3sm.py",
"references" : "clouds/clouds_model.bib",
"e3sm_atm_climos": "data/e3sm/atm",
"atm_climos": "data/e3sm/atm",
"cism_data": "data/cism/glissade",
"cloud_data": "data/obs_clouds",
"image_height" : 300
......
......@@ -24,7 +24,7 @@ title = "Summer surface albedo"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_jja = os.path.join(config['cesm_lnd_climos'],
f_cesm_lnd_climo_jja = os.path.join(config['lnd_climos'],
'b.e10.BG20TRCN.f09_g16.002_JJA_196006_200508_climo.nc')
f_racmo_alb_jja = os.path.join(config['racmo_data'], 'racmo23_GRN_monthly.alb.1980-1999.JJA.nc')
f_racmo_alb_jja_remapped = os.path.join(config['racmo_data'],
......
......@@ -25,7 +25,7 @@ title = "Summer latent heat flux"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_jja = os.path.join(config['cesm_lnd_climos'],
f_cesm_lnd_climo_jja = os.path.join(config['lnd_climos'],
'b.e10.BG20TRCN.f09_g16.002_JJA_196006_200508_climo.nc')
f_racmo_latf_jja = os.path.join(config['racmo_data'], 'racmo23_GRN_monthly.latf.1980-1999.JJA.nc')
f_racmo_latf_jja_remapped = os.path.join(config['racmo_data'],
......
......@@ -25,7 +25,7 @@ title = "Summer downward longwave radiation"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_jja = os.path.join(config['cesm_lnd_climos'],
f_cesm_lnd_climo_jja = os.path.join(config['lnd_climos'],
'b.e10.BG20TRCN.f09_g16.002_JJA_196006_200508_climo.nc')
f_racmo_lwsd_jja = os.path.join(config['racmo_data'], 'racmo23_GRN_monthly.lwsd.1980-1999.JJA.nc')
f_racmo_lwsd_jja_remapped = os.path.join(config['racmo_data'],
......
......@@ -25,7 +25,7 @@ title = "Net summer longwave radiation"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_jja = os.path.join(config['cesm_lnd_climos'],
f_cesm_lnd_climo_jja = os.path.join(config['lnd_climos'],
'b.e10.BG20TRCN.f09_g16.002_JJA_196006_200508_climo.nc')
f_racmo_lwsn_jja = os.path.join(config['racmo_data'], 'racmo23_GRN_monthly.lwsn.1980-1999.JJA.nc')
f_racmo_lwsn_jja_remapped = os.path.join(config['racmo_data'],
......
......@@ -25,7 +25,7 @@ title = "Net summer radiation"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_jja = os.path.join(config['cesm_lnd_climos'],
f_cesm_lnd_climo_jja = os.path.join(config['lnd_climos'],
'b.e10.BG20TRCN.f09_g16.002_JJA_196006_200508_climo.nc')
f_racmo_swsn_jja = os.path.join(config['racmo_data'],
'racmo23_GRN_monthly.swsn.1980-1999.JJA.nc')
......
......@@ -25,7 +25,7 @@ title = "Net shortwave radiation"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_jja = os.path.join(config['cesm_lnd_climos'],
f_cesm_lnd_climo_jja = os.path.join(config['lnd_climos'],
'b.e10.BG20TRCN.f09_g16.002_JJA_196006_200508_climo.nc')
f_racmo_senf_jja = os.path.join(config['racmo_data'],
'racmo23_GRN_monthly.senf.1980-1999.JJA.nc')
......
......@@ -25,7 +25,7 @@ title = "Summer surface mass balance"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_jja = os.path.join(config['cesm_lnd_climos'],
f_cesm_lnd_climo_jja = os.path.join(config['lnd_climos'],
'b.e10.BG20TRCN.f09_g16.002_JJA_196006_200508_climo.nc')
f_racmo_smb_jja = os.path.join(config['racmo_data'], 'racmo23_GRN_monthly.smb.1980-1999.JJA.nc')
f_racmo_smb_jja_remapped = os.path.join(config['racmo_data'],
......
......@@ -24,7 +24,7 @@ title = "Summer downward shortwave radiation"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_jja = os.path.join(config['cesm_lnd_climos'],
f_cesm_lnd_climo_jja = os.path.join(config['lnd_climos'],
'b.e10.BG20TRCN.f09_g16.002_JJA_196006_200508_climo.nc')
f_racmo_swsd_jja = os.path.join(config['racmo_data'], 'racmo23_GRN_monthly.swsd.1980-1999.JJA.nc')
f_racmo_swsd_jja_remapped = os.path.join(config['racmo_data'],
......
......@@ -24,7 +24,7 @@ title = "Net Summer shortwave radiation"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_jja = os.path.join(config['cesm_lnd_climos'],
f_cesm_lnd_climo_jja = os.path.join(config['lnd_climos'],
'b.e10.BG20TRCN.f09_g16.002_JJA_196006_200508_climo.nc')
f_racmo_swsn_jja = os.path.join(config['racmo_data'], 'racmo23_GRN_monthly.swsn.1980-1999.JJA.nc')
f_racmo_swsn_jja_remapped = os.path.join(config['racmo_data'],
......
......@@ -24,8 +24,8 @@ title = "Annual 2-meter air temperature"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_ann = os.path.join(config['cesm_lnd_climos'], 'b.e10.BG20TRCN.f09_g16.002_ANN_climo.nc')
f_cesm_atm_climo_ann = os.path.join(config['cesm_atm_climos'], 'b.e10.BG20TRCN.f09_g16.002_ANN_climo.nc')
f_cesm_lnd_climo_ann = os.path.join(config['lnd_climos'], 'b.e10.BG20TRCN.f09_g16.002_ANN_climo.nc')
f_cesm_atm_climo_ann = os.path.join(config['atm_climos'], 'b.e10.BG20TRCN.f09_g16.002_ANN_climo.nc')
f_racmo_t2m_ann = os.path.join(config['racmo_data'], 'racmo23_GRN_monthly.t2m.1980-1999.ANN.nc')
f_racmo_t2m_ann_remapped = os.path.join(config['racmo_data'],
'racmo23_GRN_monthly.t2m.1980-1999.remap2cesm.ANN.nc')
......
......@@ -24,8 +24,8 @@ title = "Winter 2-meter air temperature"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_djf = os.path.join(config['cesm_lnd_climos'], 'b.e10.BG20TRCN.f09_g16.002_DJF_climo.nc')
f_cesm_atm_climo_djf = os.path.join(config['cesm_atm_climos'], 'b.e10.BG20TRCN.f09_g16.002_DJF_climo.nc')
f_cesm_lnd_climo_djf = os.path.join(config['lnd_climos'], 'b.e10.BG20TRCN.f09_g16.002_DJF_climo.nc')
f_cesm_atm_climo_djf = os.path.join(config['atm_climos'], 'b.e10.BG20TRCN.f09_g16.002_DJF_climo.nc')
f_racmo_t2m_djf = os.path.join(config['racmo_data'], 'racmo23_GRN_monthly.t2m.1980-1999.DJF.nc')
f_racmo_t2m_djf_remapped = os.path.join(config['racmo_data'],
'racmo23_GRN_monthly.t2m.1980-1999.remap2cesm.DJF.nc')
......
......@@ -24,8 +24,8 @@ title = "Summer 2-meter air temperature"
def make_plot(config, out_path='.'):
# ---------------- Data source in TITAN ------------------------
f_cism = os.path.join(config['cism_data'], 'Greenland_5km_v1.1_SacksRev_c110629.nc')
f_cesm_lnd_climo_jja = os.path.join(config['cesm_lnd_climos'], 'b.e10.BG20TRCN.f09_g16.002_JJA_climo.nc')
f_cesm_atm_climo_jja = os.path.join(config['cesm_atm_climos'], 'b.e10.BG20TRCN.f09_g16.002_JJA_climo.nc')
f_cesm_lnd_climo_jja = os.path.join(config['lnd_climos'], 'b.e10.BG20TRCN.f09_g16.002_JJA_climo.nc')
f_cesm_atm_climo_jja = os.path.join(config['atm_climos'], 'b.e10.BG20TRCN.f09_g16.002_JJA_climo.nc')
f_racmo_t2m_jja = os.path.join(config['racmo_data'], 'racmo23_GRN_monthly.t2m.1980-1999.JJA.nc')
f_racmo_t2m_jja_remapped = os.path.join(config['racmo_data'],
'racmo23_GRN_monthly.t2m.1980-1999.remap2cesm.JJA.nc')
......
......@@ -30,7 +30,7 @@ title_bx = "Surface mass balance box plot"
def make_plot(config, out_path='.'):
# ---------------- Data source in rhea, the two files save the same data ------------------------
f_cesm_lnd_ts_qice = os.path.join(config['cesm_lnd_climos'],
f_cesm_lnd_ts_qice = os.path.join(config['lnd_climos'],
'b.e10.BG20TRCN.f09_g16.002.clm2.aavg.h0.yrly_ai.QICE.nc')
f_racmo_ts_smb_aavg = os.path.join(config['racmo_data'], 'racmo23_GRN_monthly.smb.ann_tseries_aavg.nc')
# --------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment