Skip to content

Commit

Permalink
Merge pull request #454 from CESM-Development/gswp3drvflds
Browse files Browse the repository at this point in the history 
Gswp3drvflds
  • Loading branch information
@fischer-ncar
fischer-ncar authored Jun 15, 2016
2 parents 9533749 + a5a3c95 commit 2a3f939
Show file tree
Hide file tree
Showing 23 changed files with 2,205 additions and 96 deletions.
85 changes: 85 additions & 0 deletions components/data_comps/datm/bld/namelist_files/namelist_defaults_datm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Currently the following streams are supported (term definitions precede the stre
CLM_QIAN = Run with the CLM Qian dataset valid from 1948 to 2004 (force CLM)
CLMCRUNCEP = Run with the CLM CRU NCEP V4 ( default ) forcing valid from 1900 to 2010 (force CLM)
CLMCRUNCEP_V5 = Run with the CLM CRU NCEP V5 forcing valid from 1900 to 2010 (force CLM)
CLMGSWP3 = Run with the CLM GSWP3 forcing (force CLM)
CLM1PT = Run with supplied single point data (force CLM)
CORE2_NYF = CORE2 normal year forcing (for forcing POP and CICE)
CORE2_IAF = CORE2 intra-annual year forcing (for forcing POP and CICE)
Expand Down Expand Up @@ -93,6 +94,10 @@ Currently the following streams are supported (term definitions precede the stre
CLMCRUNCEP_V5.Precip
CLMCRUNCEP_V5.TPQW
CLMGSWP3.Solar
CLMGSWP3.Precip
CLMGSWP3.TPQW
co2tseries.20tr
co2tseries.rcp2.6
co2tseries.rcp4.5
Expand Down Expand Up @@ -152,6 +157,7 @@ Currently the following streams are supported (term definitions precede the stre
<datamode datm_mode="CLM1PT" >CLMNCEP</datamode>
<datamode datm_mode="CLMCRUNCEP" >CLMNCEP</datamode>
<datamode datm_mode="CLMCRUNCEP_V5" >CLMNCEP</datamode>
<datamode datm_mode="CLMGSWP3" >CLMNCEP</datamode>
<datamode datm_mode="CPLHIST3HrWx" >CPLHIST</datamode>
<datamode datm_mode="CORE2_NYF" >CORE2_NYF</datamode>
<datamode datm_mode="CORE2_IAF" >CORE2_IAF</datamode>
Expand All @@ -165,6 +171,7 @@ Currently the following streams are supported (term definitions precede the stre
<streamslist datm_mode="CLM1PT" >CLM1PT.$ATM_GRID</streamslist>
<streamslist datm_mode="CLMCRUNCEP" >CLMCRUNCEP.Solar,CLMCRUNCEP.Precip,CLMCRUNCEP.TPQW</streamslist>
<streamslist datm_mode="CLMCRUNCEP_V5">CLMCRUNCEP_V5.Solar,CLMCRUNCEP_V5.Precip,CLMCRUNCEP_V5.TPQW</streamslist>
<streamslist datm_mode="CLMGSWP3" >CLMGSWP3.Solar,CLMGSWP3.Precip,CLMGSWP3.TPQW</streamslist>
<streamslist datm_mode="CORE2_NYF" >CORE2_NYF.GISS,CORE2_NYF.GXGXS,CORE2_NYF.NCEP</streamslist>
<streamslist datm_mode="CORE2_IAF" >CORE2_IAF.GCGCS.PREC,CORE2_IAF.GISS.LWDN,CORE2_IAF.GISS.SWDN,CORE2_IAF.GISS.SWUP,CORE2_IAF.NCEP.DN10,CORE2_IAF.NCEP.Q_10,CORE2_IAF.NCEP.SLP_,CORE2_IAF.NCEP.T_10,CORE2_IAF.NCEP.U_10,CORE2_IAF.NCEP.V_10,CORE2_IAF.CORE2.ArcFactor</streamslist>
<streamslist datm_mode="CORE2_IAF" atm_grid="01col" >CORE2_IAF.NCEP.DENS.SOFS,CORE2_IAF.NCEP.PSLV.SOFS,CORE2_IAF.PREC.SOFS.DAILY,CORE2_IAF.LWDN.SOFS.DAILY,CORE2_IAF.SWDN.SOFS.DAILY,CORE2_IAF.SWUP.SOFS.DAILY,CORE2_IAF.SHUM.SOFS.6HOUR,CORE2_IAF.TBOT.SOFS.6HOUR,CORE2_IAF.U.SOFS.6HOUR,CORE2_IAF.V.SOFS.6HOUR,CORE2_IAF.CORE2.ArcFactor</streamslist>
Expand All @@ -179,6 +186,7 @@ Currently the following streams are supported (term definitions precede the stre
<vectors datm_mode="CLM_QIAN" >null</vectors>
<vectors datm_mode="CLMCRUNCEP" >null</vectors>
<vectors datm_mode="CLMCRUNCEP_V5" >null</vectors>
<vectors datm_mode="CLMGSWP3" >null</vectors>
<vectors datm_mode="CLM1PT" >null</vectors>
<vectors datm_mode="CPLHIST3HrWx" >null</vectors>
<vectors datm_mode="CORE2_NYF" >u:v</vectors>
Expand Down Expand Up @@ -634,6 +642,83 @@ Currently the following streams are supported (term definitions precede the stre
PSRF pbot
</strm_datvar>

<!-- =============== -->
<!-- == CLMGSWP3 = -->
<!-- =============== -->

<!-- == Solar === -->
<strm_year_start stream="CLMGSWP3.Solar">$DATM_CLMNCEP_YR_START</strm_year_start>
<strm_year_end stream="CLMGSWP3.Solar">$DATM_CLMNCEP_YR_END </strm_year_end>
<strm_year_align stream="CLMGSWP3.Solar">$DATM_CLMNCEP_YR_ALIGN</strm_year_align>
<strm_domdir stream="CLMGSWP3.Solar">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.GSWP3.0.5d.V1.c141016</strm_domdir>
<strm_domfil stream="CLMGSWP3.Solar">domain.GSWP3.c2014.0.5d.nc</strm_domfil>
<strm_datdir stream="CLMGSWP3.Solar">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.GSWP3.0.5d.V1.c141016/Solar</strm_datdir>
<strm_datfil stream="CLMGSWP3.Solar">clmforc.GSWP3.c2011.0.5x0.5.Solr.%ym.nc</strm_datfil>
<strm_offset stream="CLMGSWP3.Solar">0</strm_offset>
<strm_tintalgo stream="CLMGSWP3.Solar">coszen</strm_tintalgo>
<strm_mapalgo stream="CLMGSWP3.Solar">bilinear</strm_mapalgo>
<strm_mapalgo stream="CLMGSWP3.Solar" ATM_GRID="hcru">copy</strm_mapalgo>
<strm_domvar stream="CLMGSWP3.Solar">
time time
xc lon
yc lat
area area
mask mask
</strm_domvar>
<strm_datvar stream="CLMGSWP3.Solar">
FSDS swdn
</strm_datvar>

<!-- == Precip === -->
<strm_year_start stream="CLMGSWP3.Precip">$DATM_CLMNCEP_YR_START</strm_year_start>
<strm_year_end stream="CLMGSWP3.Precip">$DATM_CLMNCEP_YR_END </strm_year_end>
<strm_year_align stream="CLMGSWP3.Precip">$DATM_CLMNCEP_YR_ALIGN</strm_year_align>
<strm_domdir stream="CLMGSWP3.Precip">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.GSWP3.0.5d.V1.c141016</strm_domdir>
<strm_domfil stream="CLMGSWP3.Precip">domain.GSWP3.c2014.0.5d.nc</strm_domfil>
<strm_datdir stream="CLMGSWP3.Precip">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.GSWP3.0.5d.V1.c141016/Precip</strm_datdir>
<strm_datfil stream="CLMGSWP3.Precip">clmforc.GSWP3.c2011.0.5x0.5.Prec.%ym.nc</strm_datfil>
<strm_offset stream="CLMGSWP3.Precip">0</strm_offset>
<strm_tintalgo stream="CLMGSWP3.Precip">nearest</strm_tintalgo>
<strm_mapalgo stream="CLMGSWP3.Precip">bilinear</strm_mapalgo>
<strm_mapalgo stream="CLMGSWP3.Precip" ATM_GRID="hcru">copy</strm_mapalgo>
<strm_domvar stream="CLMGSWP3.Precip">
time time
xc lon
yc lat
area area
mask mask
</strm_domvar>
<strm_datvar stream="CLMGSWP3.Precip">
PRECTmms precn
</strm_datvar>

<!-- == TPQW === -->
<strm_year_start stream="CLMGSWP3.TPQW">$DATM_CLMNCEP_YR_START</strm_year_start>
<strm_year_end stream="CLMGSWP3.TPQW">$DATM_CLMNCEP_YR_END </strm_year_end>
<strm_year_align stream="CLMGSWP3.TPQW">$DATM_CLMNCEP_YR_ALIGN</strm_year_align>
<strm_domdir stream="CLMGSWP3.TPQW">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.GSWP3.0.5d.V1.c141016</strm_domdir>
<strm_domfil stream="CLMGSWP3.TPQW">domain.GSWP3.c2014.0.5d.nc</strm_domfil>
<strm_datdir stream="CLMGSWP3.TPQW">$DIN_LOC_ROOT_CLMFORC/atm_forcing.datm7.GSWP3.0.5d.V1.c141016/TPHWL</strm_datdir>
<strm_datfil stream="CLMGSWP3.TPQW">clmforc.GSWP3.c2011.0.5x0.5.TPQWL.%ym.nc</strm_datfil>
<strm_offset stream="CLMGSWP3.TPQW">0</strm_offset>
<strm_tintalgo stream="CLMGSWP3.TPQW">linear</strm_tintalgo>
<strm_mapalgo stream="CLMGSWP3.TPQW">bilinear</strm_mapalgo>
<strm_mapalgo stream="CLMGSWP3.TPQW" ATM_GRID="hcru">copy</strm_mapalgo>
<strm_domvar stream="CLMGSWP3.TPQW">
time time
xc lon
yc lat
area area
mask mask
</strm_domvar>
<strm_datvar stream="CLMGSWP3.TPQW">
TBOT tbot
WIND wind
QBOT shum
PSRF pbot
FLDS lwdn
</strm_datvar>

<!-- ========================================= -->
<!-- CORE2_NYF -->
<!-- ========================================= -->
Expand Down
2 changes: 1 addition & 1 deletion components/data_comps/datm/bld/namelist_files/namelist_definition_datm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
type="char*256"
category="datm_setting"
group="datm_env_settings"
valid_values="CLM_QIAN,CLM1PT,CLMCRUNCEP,CLMCRUNCEP_V5,CPLHIST3HrWx,CORE2_NYF,CORE2_IAF,COPYALL_NPS_v1,COPYALL_CORE2_v1,WW3">
valid_values="CLM_QIAN,CLM1PT,CLMCRUNCEP,CLMCRUNCEP_V5,CLMGSWP3,CPLHIST3HrWx,CORE2_NYF,CORE2_IAF,COPYALL_NPS_v1,COPYALL_CORE2_v1,WW3">
Data Model mode to process forcing data
</entry>

Expand Down
30 changes: 28 additions & 2 deletions components/data_comps/datm/cime_config/config_component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,23 @@

<entry id="DATM_MODE">
<type>char</type>
<valid_values>CORE2_NYF,CORE2_IAF,TN460,CLM_QIAN,CLM1PT,CLMCRUNCEP,CLMCRUNCEP_V5,CPLHIST3HrWx,COPYALL_NPS_v1,COPYALL_NPS_CORE2_v1,WRF,WW3</valid_values>
<valid_values>CORE2_NYF,CORE2_IAF,TN460,CLM_QIAN,CLM1PT,CLMCRUNCEP,CLMCRUNCEP_V5,CLMGSWP3,CPLHIST3HrWx,COPYALL_NPS_v1,COPYALL_NPS_CORE2_v1,WRF,WW3</valid_values>
<default_value>CORE2_NYF</default_value>
<group>run_component_datm</group>
<file>env_run.xml</file>
<desc>Mode for data atmosphere component.
The default is CORE2_NYF (CORE2 normal year forcing) is the
DATM mode used in C and G compsets. CLM_QIAN, CLMCRUNCEP and CLM1PT are
DATM mode used in C and G compsets. CLM_QIAN, CLMCRUNCEP, CLMGSWP3 and CLM1PT are
modes using observational data for forcing CLM in I compsets.</desc>
<values>
<value compset="%NYF" >CORE2_NYF</value>
<value compset="%IAF" >CORE2_IAF</value>
<value compset="%WW3" >WW3</value>
<value compset="%NPS" >COPYALL_NPS_v1</value>
<value compset="%NPSC2">COPYALL_NPS_CORE2_v1</value>
<value compset="%QIA" >CLM_QIAN</value>
<value compset="%CRU" >CLMCRUNCEP</value>
<value compset="%GSW" >CLMGSWP3</value>
<value compset="%1PT" >CLM1PT</value>
<value compset="%S1850">CPLHIST3HrWx</value>
</values>
Expand Down Expand Up @@ -144,16 +146,22 @@
<value compset="2000.*_DATM%1PT">1</value>
<value compset="1850.*_DATM%QIA">1</value>
<value compset="1850.*_DATM%CRU">1</value>
<value compset="1850.*_DATM%GSW">1</value>
<value compset="2000.*_DATM%QIA">1</value>
<value compset="HIST.*_DATM%QIA">1895</value>
<value compset="HIST.*_DATM%CRU">1901</value>
<value compset="HIST.*_DATM%GSW">1901</value>
<value compset="4804.*_DATM%QIA">1</value>
<value compset="RCP.*_DATM%QIA">2004</value>
<value compset="RCP.*_DATM%CRU">2005</value>
<value compset="RCP.*_DATM%GSW">2005</value>
<value compset="2003.*_DATM%QIA.*_TEST">1</value>
<value compset="1850.*_DATM%CRU">1</value>
<value compset="2000.*_DATM%CRU">1</value>
<value compset="2003.*_DATM%CRU">1</value>
<value compset="1850.*_DATM%GSW">1</value>
<value compset="2000.*_DATM%GSW">1</value>
<value compset="2003.*_DATM%GSW">1</value>
</values>
<group>run_component_datm</group>
<file>env_run.xml</file>
Expand All @@ -168,16 +176,22 @@
<value compset="2000.*_DATM%1PT">1972</value>
<value compset="1850.*_DATM%QIA">1948</value>
<value compset="1850.*_DATM%CRU">1901</value>
<value compset="1850.*_DATM%GSW">1901</value>
<value compset="2000.*_DATM%QIA">1972</value>
<value compset="HIST.*_DATM%QIA">1948</value>
<value compset="HIST.*_DATM%CRU">1901</value>
<value compset="HIST.*_DATM%GSW">1901</value>
<value compset="4804.*_DATM%QIA">1948</value>
<value compset="RCP.*_DATM%QIA" >1972</value>
<value compset="RCP.*_DATM%CRU" >1991</value>
<value compset="RCP.*_DATM%GSW" >1991</value>
<value compset="2003.*_DATM%QIA.*_TEST">2002</value>
<value compset="1850.*_DATM%CRU">1901</value>
<value compset="2000.*_DATM%CRU">1991</value>
<value compset="2003.*_DATM%CRU">2002</value>
<value compset="1850.*_DATM%GSW">1901</value>
<value compset="2000.*_DATM%GSW">1991</value>
<value compset="2003.*_DATM%GSW">2002</value>
</values>
<group>run_component_datm</group>
<file>env_run.xml</file>
Expand All @@ -192,16 +206,22 @@
<value compset="2000.*_DATM%1PT">2004</value>
<value compset="1850.*_DATM%QIA">1972</value>
<value compset="1850.*_DATM%CRU">1920</value>
<value compset="1850.*_DATM%GSW">1920</value>
<value compset="2000.*_DATM%QIA">2004</value>
<value compset="HIST.*_DATM%QIA">1972</value>
<value compset="HIST.*_DATM%CRU">1920</value>
<value compset="HIST.*_DATM%GSW">1920</value>
<value compset="4804.*_DATM%QIA">2004</value>
<value compset="RCP.*_DATM%QIA">2004</value>
<value compset="RCP.*_DATM%CRU">2010</value>
<value compset="RCP.*_DATM%GSW">2010</value>
<value compset="2003.*_DATM%QIA.*_TEST">2003</value>
<value compset="1850.*_DATM%CRU">1920</value>
<value compset="2000.*_DATM%CRU">2010</value>
<value compset="2003.*_DATM%CRU">2003</value>
<value compset="1850.*_DATM%GSW">1920</value>
<value compset="2000.*_DATM%GSW">2010</value>
<value compset="2003.*_DATM%GSW">2003</value>
</values>
<group>run_component_datm</group>
<file>env_run.xml</file>
Expand All @@ -220,10 +240,16 @@
<desc compset="^2003_DATM%CRU" >CRUNCEP atm input data for 2002-2003:</desc>
<desc compset="^HIST_DATM%CRU" >CRUNCEP atm input data for 1901-1920:</desc>
<desc compset="^RCP[2468]_DATM%CRU" >CRUNCEP atm input data for 1991-2010:</desc>
<desc compset="^1850_DATM%GSW" >GSWP3 atm input data for 1901-1920:</desc>
<desc compset="^2000_DATM%GSW" >GSWP3 atm input data for 1991-2010:</desc>
<desc compset="^2003_DATM%GSW" >GSWP3 atm input data for 2002-2003:</desc>
<desc compset="^HIST_DATM%GSW" >GSWP3 atm input data for 1901-1920:</desc>
<desc compset="^RCP[2468]_DATM%GSW" >GSWP3 atm input data for 1991-2010:</desc>
<desc compset="^1850_DATM%S1850" >CPL history input data:</desc>
<desc compset="^2000_DATM%1PT" >single point tower site atm input data:</desc>
<desc compset="_DATM%NYF" >COREv2 datm normal year forcing: (requires additional user-supplied data)</desc>
<desc compset="_DATM%IAF" >COREv2 datm interannual year forcing: (requires additional user-supplied data)</desc>
<desc compset="_DATM%WW3" >WW3 wave watch data from a short period of hi temporal frequency COREv2 data</desc>
<desc compset="_DATM%NPS" >DATM NPS forcing:</desc>
</description>

Expand Down
Loading

0 comments on commit 2a3f939

Please sign in to comment.