-
Notifications
You must be signed in to change notification settings - Fork 216
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
DOCN aquaplanet from file and new A compsets with DOCN modes #1582
Changes from all commits
4358e34
6d0667e
0cf6166
aea59c5
9d9ce4c
359a6f9
094e30d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,6 +56,7 @@ | |
<value docn_mode="sst_aquap8">''</value> | ||
<value docn_mode="sst_aquap9">''</value> | ||
<value docn_mode="sst_aquap10">''</value> | ||
<value docn_mode="sst_aquapfile">aquapfile</value> | ||
<value docn_mode="som">som</value> | ||
<value docn_mode="som_aquap">som</value> | ||
<value docn_mode="interannual">interannual</value> | ||
|
@@ -89,6 +90,7 @@ | |
<desc>Stream domain file directory.</desc> | ||
<values> | ||
<value>null</value> | ||
<value stream="aquapfile">$DIN_LOC_ROOT/ocn/docn7/AQUAPLANET/</value> | ||
<value stream="som">$DIN_LOC_ROOT/ocn/docn7/SOM</value> | ||
<value stream="interannual">$DIN_LOC_ROOT/atm/cam/sst</value> | ||
</values> | ||
|
@@ -101,6 +103,7 @@ | |
<desc>Stream domain file path(s).</desc> | ||
<values> | ||
<value>null</value> | ||
<value stream="aquapfile">$DOCN_AQP_FILENAME</value> | ||
<value stream="som">$DOCN_SOM_FILENAME</value> | ||
<value stream="interannual">sst_HadOIBl_bc_1x1_1850_2014_c150416.nc</value> | ||
</values> | ||
|
@@ -121,8 +124,13 @@ | |
</value> | ||
<value stream="interannual"> | ||
time time | ||
lon lon | ||
lat lat | ||
lon lon | ||
lat lat | ||
</value> | ||
<value stream="aquapfile"> | ||
time time | ||
lon lon | ||
lat lat | ||
</value> | ||
</values> | ||
</entry> | ||
|
@@ -134,6 +142,7 @@ | |
<desc>Stream data file directory.</desc> | ||
<values> | ||
<value>null</value> | ||
<value stream="aquapfile">$DIN_LOC_ROOT/ocn/docn7/AQUAPLANET</value> | ||
<value stream="som">$DIN_LOC_ROOT/ocn/docn7/SOM</value> | ||
<value stream="interannual">$DIN_LOC_ROOT/atm/cam/sst</value> | ||
</values> | ||
|
@@ -146,20 +155,7 @@ | |
<desc>Stream data file path(s).</desc> | ||
<values> | ||
<value>null</value> | ||
<value stream="prescribed" sstice_stream="WRFDATA_wus12"> | ||
sst_wus12_110111.2003-10.nc | ||
sst_wus12_110111.2003-11.nc | ||
sst_wus12_110111.2003-12.nc | ||
sst_wus12_110111.2004-01.nc | ||
sst_wus12_110111.2004-02.nc | ||
sst_wus12_110111.2004-03.nc | ||
sst_wus12_110111.2004-04.nc | ||
sst_wus12_110111.2004-05.nc | ||
sst_wus12_110111.2004-06.nc | ||
sst_wus12_110111.2004-07.nc | ||
sst_wus12_110111.2004-08.nc | ||
sst_wus12_110111.2004-09.nc | ||
</value> | ||
<value stream="aquapfile">$DOCN_AQP_FILENAME</value> | ||
<value stream="som">$DOCN_SOM_FILENAME</value> | ||
<value stream="interannual">sst_HadOIBl_bc_1x1_1850_2014_c150416.nc</value> | ||
</values> | ||
|
@@ -185,10 +181,13 @@ | |
qdp qbot | ||
</value> | ||
<value stream="interannual"> | ||
SST_cpl t | ||
SST_cpl t | ||
</value> | ||
<value stream="prescribed" sstice_stream="CAMDATA"> | ||
SST_cpl t | ||
SST_cpl t | ||
</value> | ||
<value stream="aquapfile"> | ||
SST_cpl t | ||
</value> | ||
</values> | ||
</entry> | ||
|
@@ -211,6 +210,7 @@ | |
<values> | ||
<value>-999</value> | ||
<value stream="prescribed">$SSTICE_YEAR_ALIGN</value> | ||
<value stream="aquapfile">0</value> | ||
<value stream="som">1</value> | ||
<value stream="interannual">1</value> | ||
</values> | ||
|
@@ -224,6 +224,7 @@ | |
<values> | ||
<value>-999</value> | ||
<value stream="prescribed">$SSTICE_YEAR_START</value> | ||
<value stream="aquapfile">0</value> | ||
<value stream="som">1</value> | ||
<value stream="interannual">1850</value> | ||
</values> | ||
|
@@ -237,6 +238,7 @@ | |
<values> | ||
<value>-999</value> | ||
<value stream="prescribed">$SSTICE_YEAR_END</value> | ||
<value stream="aquapfile">0</value> | ||
<value stream="som">1</value> | ||
<value stream="interannual">2014</value> | ||
</values> | ||
|
@@ -254,7 +256,7 @@ | |
<type>char</type> | ||
<category>streams</category> | ||
<group>shr_strdata_nml</group> | ||
<valid_values>SSTDATA,SST_AQUAP1,SST_AQUAP2,SST_AQUAP3,SST_AQUAP4,SST_AQUAP5,SST_AQUAP6,SST_AQUAP7,SST_AQUAP8,SST_AQUAP9,SST_AQUAP10,SOM,SOM_AQUAP,IAF,NULL,COPYALL</valid_values> | ||
<valid_values>SSTDATA,SST_AQUAP1,SST_AQUAP2,SST_AQUAP3,SST_AQUAP4,SST_AQUAP5,SST_AQUAP6,SST_AQUAP7,SST_AQUAP8,SST_AQUAP9,SST_AQUAP10,SST_AQUAPFILE,SOM,SOM_AQUAP,IAF,NULL,COPYALL</valid_values> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. COPYALL wasn't removed here but is removed in other parts of this PR There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The datamode in namelist_definition.xml and the DOCN_MODE are not the same thing. The DOCN_MODE maps to a datamode that is used directly by the docn model. For now DOCN_MODE copyall is not used - so I removed it. But the DOCN datamodel value of COPYALL could still be used at some point - so it should stay in the valid values. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok. Just update the PR to mention that COPYALL is being removed from DOCN_MODE. |
||
<desc> | ||
General method that operates on the data. This is generally | ||
implemented in the data models but is set in the strdata method for | ||
|
@@ -310,16 +312,17 @@ | |
<values> | ||
<value docn_mode="null">NULL</value> | ||
<value docn_mode="prescribed">SSTDATA</value> | ||
<value docn_mode="sst_aquap1">SST_AQUAP1</value> | ||
<value docn_mode="sst_aquap2">SST_AQUAP2</value> | ||
<value docn_mode="sst_aquap3">SST_AQUAP3</value> | ||
<value docn_mode="sst_aquap4">SST_AQUAP4</value> | ||
<value docn_mode="sst_aquap5">SST_AQUAP5</value> | ||
<value docn_mode="sst_aquap6">SST_AQUAP6</value> | ||
<value docn_mode="sst_aquap7">SST_AQUAP7</value> | ||
<value docn_mode="sst_aquap8">SST_AQUAP8</value> | ||
<value docn_mode="sst_aquap9">SST_AQUAP9</value> | ||
<value docn_mode="sst_aquap10">SST_AQUAP10</value> | ||
<value docn_mode="sst_aquap1$">SST_AQUAP1</value> | ||
<value docn_mode="sst_aquap2$">SST_AQUAP2</value> | ||
<value docn_mode="sst_aquap3$">SST_AQUAP3</value> | ||
<value docn_mode="sst_aquap4$">SST_AQUAP4</value> | ||
<value docn_mode="sst_aquap5$">SST_AQUAP5</value> | ||
<value docn_mode="sst_aquap6$">SST_AQUAP6</value> | ||
<value docn_mode="sst_aquap7$">SST_AQUAP7</value> | ||
<value docn_mode="sst_aquap8$">SST_AQUAP8</value> | ||
<value docn_mode="sst_aquap9$">SST_AQUAP9</value> | ||
<value docn_mode="sst_aquap10$">SST_AQUAP10</value> | ||
<value docn_mode="sst_aquapfile$">SST_AQUAPFILE</value> | ||
<value docn_mode="som$">SOM</value> | ||
<value docn_mode="som_aquap">SOM_AQUAP</value> | ||
<value docn_mode="interannual">IAF</value> | ||
|
@@ -505,7 +508,6 @@ | |
</desc> | ||
<values> | ||
<value>cycle</value> | ||
<value stream="prescribed" sstice_stream="WRFDATA_wus12">limit</value> | ||
<value stream="prescribed" sstice_stream="WRFDATA">limit</value> | ||
</values> | ||
</entry> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you mean to get rid of "copyall"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes.
copyall
was not being used so having it there was simply confusing.