Skip to content

Commit

Permalink
minor fixes for GEOSIT/FP
Browse files Browse the repository at this point in the history
  • Loading branch information
@rtodling
rtodling committed Oct 3, 2022
1 parent 3f38ef7 commit 910ce97
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 28 deletions.
2 changes: 1 addition & 1 deletion AGCM.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ USE_RRTMG_IRRAD: 1.0
USE_RRTMG_SORAD: 1.0
ISOLVAR: 2
USE_NRLSSI2: .TRUE.
SOLAR_CYCLE_FILE_NAME: ExtData/g5gcm/solar/NRLSSI2.v2020.txt
SOLAR_CYCLE_FILE_NAME: ExtData/g5gcm/solar/NRLSSI2.v2021.txt

# GOCART broadband aerosol optics tables
# -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion HISTORY_FP.rc.21z.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3364,7 +3364,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
bkg_clcv_rst.frequency: @ASYNFRQ ,
bkg_clcv_rst.duration: @ASYNFRQ ,
bkg_clcv_rst.mode: 'instantaneous',
traj.lcv_rst.grid_label: PE@APERT_IMx@APERT_JM-CF,
bkg_clcv_rst.grid_label: PE@APERT_IMx@APERT_JM-CF,
bkg_clcv_rst.fields: 'U_DGRID;V_DGRID' , 'DYN' , 'u;v' ,
'U;V' , 'DYN' , 'ua;va' ,
'T' , 'DYN' , 't' ,
Expand Down
40 changes: 14 additions & 26 deletions HISTORY_GEOSIT.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1919,7 +1919,7 @@ COLLECTIONS: 'asm_inst_3hr_glo_L576x361_p42'
'FRLANDICE' , 'SURFACE' ,
'FRLAKE' , 'SURFACE' ,
'FROCEAN' , 'SURFACE' ,
'FRACI' , 'SURFACE' ,
'FRACI' , 'SURFACE' , 'FRSEAICE' ,
'RH2' , 'MOIST' , 'RH' ,
'AIRDENS' , 'CHEMENV' ,
# Dust
Expand Down Expand Up @@ -2531,11 +2531,8 @@ COLLECTIONS: 'asm_inst_3hr_glo_L576x361_p42'
chm_tavg_3hr_glo_L576x361_slv.nbits: 10 ,
chm_tavg_3hr_glo_L576x361_slv.deflate: 2 ,
chm_tavg_3hr_glo_L576x361_slv.regrid_method: 'BILINEAR_MONOTONIC' ,
chm_tavg_3hr_glo_L576x361_slv.fields: 'FRLAND' , 'SURFACE' ,
'FRLANDICE' , 'SURFACE' ,
'FRLAKE' , 'SURFACE' ,
'FROCEAN' , 'SURFACE' ,
'FRACI' , 'SURFACE' ,
chm_tavg_3hr_glo_L576x361_slv.fields: 'FRACI' , 'SURFACE' , 'FRSEAICE' ,
'TS' , 'SURFACE' ,
'CO2EM001' , 'GOCART' , 'CO2EM' ,
'CO2CL001' , 'GOCART' , 'CO2CL' ,
'CO2SC001' , 'GOCART' , 'CO2SC' ,
Expand All @@ -2557,11 +2554,8 @@ COLLECTIONS: 'asm_inst_3hr_glo_L576x361_p42'
chm_tavg_3hr_glo_C180x180x6_slv.nbits: 10 ,
chm_tavg_3hr_glo_C180x180x6_slv.deflate: 2 ,
chm_tavg_3hr_glo_C180x180x6_slv.regrid_method: 'BILINEAR_MONOTONIC' ,
chm_tavg_3hr_glo_C180x180x6_slv.fields: 'FRLAND' , 'SURFACE' ,
'FRLANDICE' , 'SURFACE' ,
'FRLAKE' , 'SURFACE' ,
'FROCEAN' , 'SURFACE' ,
'FRACI' , 'SURFACE' ,
chm_tavg_3hr_glo_C180x180x6_slv.fields: 'FRACI' , 'SURFACE' , 'FRSEAICE' ,
'TS' , 'SURFACE' ,
'CO2EM001' , 'GOCART' , 'CO2EM' ,
'CO2CL001' , 'GOCART' , 'CO2CL' ,
'CO2SC001' , 'GOCART' , 'CO2SC' ,
Expand Down Expand Up @@ -2658,11 +2652,8 @@ COLLECTIONS: 'asm_inst_3hr_glo_L576x361_p42'
aer_inst_3hr_glo_L576x361_v72.regrid_method: 'BILINEAR_MONOTONIC' ,
aer_inst_3hr_glo_L576x361_v72.fields: 'PS' , 'DYN' ,
'DELP' , 'DYN' ,
'FRLAND' , 'SURFACE' ,
'FRLANDICE' , 'SURFACE' ,
'FRLAKE' , 'SURFACE' ,
'FROCEAN' , 'SURFACE' ,
'FRACI' , 'SURFACE' ,
'FRACI' , 'SURFACE' , 'FRSEAICE' ,
'TS' , 'SURFACE' ,
'RH2' , 'MOIST' , 'RH' ,
'AIRDENS' , 'CHEMENV' ,
# Dust
Expand Down Expand Up @@ -2709,11 +2700,8 @@ COLLECTIONS: 'asm_inst_3hr_glo_L576x361_p42'
aer_inst_3hr_glo_C180x180x6_v72.regrid_method: 'BILINEAR_MONOTONIC' ,
aer_inst_3hr_glo_C180x180x6_v72.fields: 'PS' , 'DYN' ,
'DELP' , 'DYN' ,
'FRLAND' , 'SURFACE' ,
'FRLANDICE' , 'SURFACE' ,
'FRLAKE' , 'SURFACE' ,
'FROCEAN' , 'SURFACE' ,
'FRACI' , 'SURFACE' ,
'FRACI' , 'SURFACE' , 'FRSEAICE' ,
'TS' , 'SURFACE' ,
'RH2' , 'MOIST' , 'RH' ,
'AIRDENS' , 'CHEMENV' ,
# Dust
Expand Down Expand Up @@ -2859,7 +2847,7 @@ COLLECTIONS: 'asm_inst_3hr_glo_L576x361_p42'
'FRLANDICE' , 'SURFACE' ,
'FRLAKE' , 'SURFACE' ,
'FROCEAN' , 'SURFACE' ,
'FRACI' , 'SURFACE' ,
'FRACI' , 'SURFACE' , 'FRSEAICE' ,
'COEMbbae' , 'GOCART' ,
'COEMbbna' , 'GOCART' ,
'COEMbbla' , 'GOCART' ,
Expand Down Expand Up @@ -3627,7 +3615,7 @@ COLLECTIONS: 'asm_inst_3hr_glo_L576x361_p42'
'FRLANDICE' , 'SURFACE' ,
'FRLAKE' , 'SURFACE' ,
'FROCEAN' , 'SURFACE' ,
'FRACI' , 'SURFACE' ,
'FRACI' , 'SURFACE' , 'FRSEAICE' ,
# Extinction
'DUEXTCOEF' , 'GOCART' , 'DUEXT' ,
'SSEXTCOEF' , 'GOCART' , 'SSEXT' ,
Expand Down Expand Up @@ -3660,7 +3648,7 @@ COLLECTIONS: 'asm_inst_3hr_glo_L576x361_p42'
'FRLANDICE' , 'SURFACE' ,
'FRLAKE' , 'SURFACE' ,
'FROCEAN' , 'SURFACE' ,
'FRACI' , 'SURFACE' ,
'FRACI' , 'SURFACE' , 'FRSEAICE' ,
'DUMASS' , 'GOCART' , 'DU' ,
'SSMASS' , 'GOCART' , 'SS' ,
'BCMASS' , 'GOCART' , 'BC' ,
Expand All @@ -3687,7 +3675,7 @@ COLLECTIONS: 'asm_inst_3hr_glo_L576x361_p42'
'FRLANDICE' , 'SURFACE' ,
'FRLAKE' , 'SURFACE' ,
'FROCEAN' , 'SURFACE' ,
'FRACI' , 'SURFACE' ,
'FRACI' , 'SURFACE' , 'FRSEAICE' ,
'AIRDENS' , 'CHEMENV' ,
'GOCART::CO' , 'GOCART' , 'CO' ,
'GOCART::CO2' , 'GOCART' , 'CO2' ,
Expand All @@ -3711,7 +3699,7 @@ COLLECTIONS: 'asm_inst_3hr_glo_L576x361_p42'
'FRLANDICE' , 'SURFACE' ,
'FRLAKE' , 'SURFACE' ,
'FROCEAN' , 'SURFACE' ,
'FRACI' , 'SURFACE' ,
'FRACI' , 'SURFACE' , 'FRSEAICE' ,
'AIRDENS' , 'CHEMENV' ,
'GOCART::COBBAE' , 'GOCART' , 'CObbae' ,
'GOCART::COBBAF' , 'GOCART' , 'CObbaf' ,
Expand Down

0 comments on commit 910ce97

Please sign in to comment.