[cmor] 46/190: 2010-09-01 : fixed a bug on mac 32bit when reading in net3 version string 2010-09-01 : some vars with grid and singleton dims were wrongly analyzed by cmor_variable has not being defined with the right number of dimmensions. 2010-09-01 : updated doc. Was saying you can pass "none" for units when it really is: "" 2010-09-01 : updated doc. Was wrongly stating you can pass "none" if no missing_value
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit fa08edf4e195ee104bc8b3df5b9bca39b5d2b107
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Wed Sep 1 16:43:08 2010 -0700
2010-09-01 : fixed a bug on mac 32bit when reading in net3 version string
2010-09-01 : some vars with grid and singleton dims were wrongly analyzed by cmor_variable has not being defined with the right number of dimmensions.
2010-09-01 : updated doc. Was saying you can pass "none" for units when it really is: ""
2010-09-01 : updated doc. Was wrongly stating you can pass "none" if no missing_value
---
Doc/cmor_users_guide.doc | Bin 357888 -> 358400 bytes
Doc/cmor_users_guide.htm | 532 ++++++++++++++++++++++----------------------
Doc/cmor_users_guide.pdf | Bin 555729 -> 496928 bytes
RELEASE-NOTES | 3 +
Src/cmor.c | 1 +
Src/cmor_variables.c | 2 +-
Test/test_python_joerg_6.py | 41 ++++
Test/test_python_joerg_8.py | 97 ++++++++
8 files changed, 411 insertions(+), 265 deletions(-)
diff --git a/Doc/cmor_users_guide.doc b/Doc/cmor_users_guide.doc
index 7362365..7273111 100644
Binary files a/Doc/cmor_users_guide.doc and b/Doc/cmor_users_guide.doc differ
diff --git a/Doc/cmor_users_guide.htm b/Doc/cmor_users_guide.htm
index d7fc3fa..f4c9674 100644
--- a/Doc/cmor_users_guide.htm
+++ b/Doc/cmor_users_guide.htm
@@ -19,17 +19,17 @@ xmlns:css="http://macVmlSchemaUri" xmlns="http://www.w3.org/TR/REC-html40">
<o:Template>Normal.dotm</o:Template>
<o:LastAuthor>Default</o:LastAuthor>
<o:Revision>2</o:Revision>
- <o:TotalTime>0</o:TotalTime>
- <o:LastPrinted>2010-08-18T15:33:00Z</o:LastPrinted>
- <o:Created>2010-08-18T15:33:00Z</o:Created>
- <o:LastSaved>2010-08-18T15:33:00Z</o:LastSaved>
- <o:Pages>13</o:Pages>
- <o:Words>23780</o:Words>
- <o:Characters>135551</o:Characters>
+ <o:TotalTime>1</o:TotalTime>
+ <o:LastPrinted>2010-09-01T23:33:00Z</o:LastPrinted>
+ <o:Created>2010-09-01T23:34:00Z</o:Created>
+ <o:LastSaved>2010-09-01T23:34:00Z</o:LastSaved>
+ <o:Pages>6</o:Pages>
+ <o:Words>23769</o:Words>
+ <o:Characters>135487</o:Characters>
<o:Company>PCMDI</o:Company>
<o:Lines>1129</o:Lines>
- <o:Paragraphs>271</o:Paragraphs>
- <o:CharactersWithSpaces>166466</o:CharactersWithSpaces>
+ <o:Paragraphs>270</o:Paragraphs>
+ <o:CharactersWithSpaces>166387</o:CharactersWithSpaces>
<o:Version>12.0</o:Version>
</o:DocumentProperties>
<o:OfficeDocumentSettings>
@@ -81,7 +81,6 @@ xmlns:css="http://macVmlSchemaUri" xmlns="http://www.w3.org/TR/REC-html40">
panose-1:5 2 1 2 1 8 4 8 7 8;
mso-font-charset:2;
mso-generic-font-family:auto;
- mso-font-format:other;
mso-font-pitch:variable;
mso-font-signature:0 0 65536 0 -2147483648 0;}
@font-face
@@ -1390,7 +1389,7 @@ style='font-size:14.0pt'>Charles Doutriaux, Karl E. Taylor<o:p></o:p></span></p>
style='font-size:14.0pt'><span style='mso-element:field-begin'></span><span
style="mso-spacerun: yes"> </span>TIME \@ "MMMM d, yyyy" <span
style='mso-element:field-separator'></span></span><![endif]--><span
-style='font-size:14.0pt'><span style='mso-no-proof:yes'>August 18, 2010</span></span><!--[if supportFields]><span
+style='font-size:14.0pt'><span style='mso-no-proof:yes'>September 1, 2010</span></span><!--[if supportFields]><span
style='font-size:14.0pt'><span style='mso-element:field-end'></span></span><![endif]--><span
style='font-size:14.0pt'><o:p></o:p></span></p>
@@ -3561,7 +3560,7 @@ values can be made only if CMOR is built with CDMS.) These units must be
recognized by udunits or must be identical to the units specified in the MIP
table.<span style="mso-spacerun: yes"> </span>In the case of a
dimensionless vertical coordinate or in the case of a non-numerical axis (like
-geographical region), either set units='none', or, optionally, set units='1'.</p>
+geographical region), either set units=’’, or, optionally, set units='1'.</p>
<p class=MsoNormal style='margin-left:1.0in;text-align:justify;text-indent:
-.5in'>[length] = integer specifying the number of elements that CMOR should
@@ -4238,8 +4237,7 @@ indicate missing data for this variable.<span style="mso-spacerun: yes">
style="mso-spacerun: yes"> </span>This missing_value will in general be
replaced by a standard missing_value specified in the MIP table.<span
style="mso-spacerun: yes"> </span>If there are no missing data, and the
-user chooses not to declare the missing value, then this argument may be either
-omitted or assigned the value 'none' (i.e., missing_value='none').<o:p></o:p></span></p>
+user chooses not to declare the missing value, then this argument may be omitted.<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:1.0in;text-align:justify;text-indent:
-.5in'><span style='color:blue;background:silver;mso-highlight:silver'>[coordinate_type]
@@ -4358,7 +4356,7 @@ written to the netCDF file by CMOR.) .<span style="mso-spacerun: yes">
</span>These units must be recognized by udunits or must be identical to the
units specified in the MIP table.<span style="mso-spacerun: yes">
</span>In the case of a dimensionless z-factors, either omit this argument, or
-set units='none', or set units='1'.</p>
+set units=’’, or set units='1'.</p>
<p class=MsoNormal style='margin-left:1.0in;text-align:justify;text-indent:
-.5in'><span style='color:blue'>type = type of the zfactor_values and zfactor_bounds
@@ -4533,8 +4531,9 @@ that will be passed to cmor_write.<span style="mso-spacerun: yes">
</span>This missing_value will in general be replaced by a standard
missing_value specified in the MIP table.<span style="mso-spacerun: yes">
</span>If there are no missing data, and the user chooses not to declare the
-missing value, then this argument may be either omitted or assigned the value
-'none' (i.e., missing_value='none').</p>
+missing value, then this argument may be omitted <s><span style='background:
+silver;mso-highlight:silver'>or assigned the value 'none' (i.e.,
+missing_value='none'</span>).</s></p>
<p class=MsoNormal style='margin-left:1.0in;text-align:justify;text-indent:
-.5in'>[tolerance] = scalar (type real) indicating fractional tolerance allowed
@@ -5597,8 +5596,8 @@ many axes (see annex on CMOR limits)<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.25in;mso-list:l36 level1 lfo25'><![if !supportLists]><span
style='font-size:10.0pt;mso-bidi-font-size:14.0pt'><span style='mso-list:Ignore'>78.<span
style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]><span
-style='font-size:10.0pt;mso-bidi-font-size:14.0pt'>Defining variable with axes ids
-that are not valid.<o:p></o:p></span></p>
+style='font-size:10.0pt;mso-bidi-font-size:14.0pt'>Defining variable with axes
+ids that are not valid.<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.25in;mso-list:l36 level1 lfo25'><![if !supportLists]><span
style='font-size:10.0pt;mso-bidi-font-size:14.0pt'><span style='mso-list:Ignore'>79.<span
@@ -6033,8 +6032,8 @@ INTENT(OUT), DIMENSION(:,:) :: bnds_lat<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>DOUBLE PRECISION,
-INTENT(OUT), DIMENSION(:,:) :: bnds_lon<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>DOUBLE PRECISION, INTENT(OUT),
+DIMENSION(:,:) :: bnds_lon<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6054,8 +6053,8 @@ style="mso-spacerun: yes"> </span>DO i = 1, SIZE(alons)<o:p></
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>alons(i) =
-(i-1)*360./SIZE(alons)<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>alons(i)
+= (i-1)*360./SIZE(alons)<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6091,9 +6090,8 @@ style="mso-spacerun: yes">
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span>bnds_lat(2,i) = (size(alats)+1-i)*10
-- 5.<o:p></o:p></span></p>
+style="mso-spacerun: yes">
+</span>bnds_lat(2,i) = (size(alats)+1-i)*10 - 5.<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6165,7 +6163,8 @@ style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>INTEGER, INTENT(IN) :: it<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>INTEGER, INTENT(IN) :: it<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6174,8 +6173,8 @@ INTENT(OUT) :: time<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>DOUBLE PRECISION, INTENT(OUT),
-DIMENSION(2,1) :: time_bnds<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>DOUBLE PRECISION,
+INTENT(OUT), DIMENSION(2,1) :: time_bnds<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6403,7 +6402,8 @@ style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>INTEGER :: i, j<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>INTEGER :: i, j<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6420,7 +6420,8 @@ style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>tmp = TRIM(ADJUSTL(varname))<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>tmp =
+TRIM(ADJUSTL(varname))<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6456,8 +6457,8 @@ style="mso-spacerun: yes"> </span>factor =
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>offset =
--220.<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span
+style="mso-spacerun: yes"> </span>offset = -220.<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6479,8 +6480,8 @@ style="mso-spacerun: yes"> </span>CASE ('PSURF')<o:p></o:p></s
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span
-style="mso-spacerun: yes"> </span>factor = 100.<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>factor =
+100.<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6712,8 +6713,10 @@ yes">
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!<span
style="mso-spacerun:
-yes">
-</span>with evolving code design<o:p></o:p></span></p>
+yes">
+</span><span style="mso-spacerun:
+yes"> </span>with
+evolving code design<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><o:p> </o:p></span></p>
@@ -6758,9 +6761,8 @@ process<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes"> </span>INTEGER, PARAMETER :: lon = 4<span
-style="mso-spacerun: yes"> </span><span
-style="mso-spacerun: yes"> </span>! number of longitude grid cells<span
-style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>! number
+of longitude grid cells<span style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6802,8 +6804,8 @@ of IPCC Table A1c fields to <o:p></o:p></span></p>
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
yes">
-</span>!<span style="mso-spacerun: yes"> </span>be output.<span
-style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
+</span>!<span style="mso-spacerun: yes"> </span>be
+output.<span style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><o:p> </o:p></span></p>
@@ -6857,9 +6859,8 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes">
-</span><span style="mso-spacerun: yes"> </span>! My variable names for
-IPCC Table A1c fields<o:p></o:p></span></p>
+yes">
+</span>! My variable names for IPCC Table A1c fields<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6871,7 +6872,8 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
style="mso-spacerun:
yes">
</span>varin3d=(/'CLOUD', 'U<span style="mso-spacerun: yes">
-</span>', 'T<span style="mso-spacerun: yes"> </span>'/)<o:p></o:p></span></p>
+</span>', 'T<span style="mso-spacerun: yes"> </span><span
+style="mso-spacerun: yes"> </span>'/)<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><o:p> </o:p></span></p>
@@ -6916,10 +6918,8 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes">
-</span><span style="mso-spacerun:
-yes"> </span>! My
-variable names for IPCC Table A1a fields<o:p></o:p></span></p>
+yes">
+</span>! My variable names for IPCC Table A1a fields<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -6966,9 +6966,10 @@ style="mso-spacerun: yes"> </span>CHARACTER (LEN=4), DIMENSION(n2d)
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
+style="mso-spacerun: yes"> </span><span
style="mso-spacerun:
-yes">
-</span>positive2d= (/<span style="mso-spacerun: yes"> </span>'down',<span
+yes"> </span>positive2d=
+(/<span style="mso-spacerun: yes"> </span>'down',<span
style="mso-spacerun: yes"> </span>'<span style="mso-spacerun:
yes"> </span>', '<span style="mso-spacerun:
yes"> </span>', '<span style="mso-spacerun:
@@ -7006,7 +7007,8 @@ communicating with CMOR:<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!<span
-style="mso-spacerun: yes"> </span>---------------------------------------------------------<o:p></o:p></span></p>
+style="mso-spacerun: yes">
+</span>---------------------------------------------------------<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><o:p> </o:p></span></p>
@@ -7177,10 +7179,9 @@ pressure coordinate values into <o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span>!<span style="mso-spacerun: yes"> </span>alats,
-alons, and plevs, respectively.<span style="mso-spacerun: yes">
-</span>Also generate latitude and <o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>!<span style="mso-spacerun:
+yes"> </span>alats, alons, and plevs, respectively.<span
+style="mso-spacerun: yes"> </span>Also generate latitude and <o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -7307,8 +7308,8 @@ yes"> &nb
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes">
-</span>experiment_id='abrupt 4XCO2',<span style="mso-spacerun:
+style="mso-spacerun: yes"> </span>experiment_id='abrupt
+4XCO2',<span style="mso-spacerun:
yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
@@ -7320,9 +7321,8 @@ yes"> &nb
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span>'GICC (Generic International Climate
-Center, ' //<span style="mso-spacerun:
+style="mso-spacerun: yes"> </span>'GICC
+(Generic International Climate Center, ' //<span style="mso-spacerun:
yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
@@ -7370,9 +7370,8 @@ yes"> &nb
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes">
</span>realization=1,<span style="mso-spacerun:
-yes">
-</span><span style="mso-spacerun:
-yes"> </span>&<o:p></o:p></span></p>
+yes">
+</span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -7410,8 +7409,8 @@ style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes"> </span>'(J.
-Geophys. Res., 2001, 576-591).<span style="mso-spacerun: yes">
-</span>Also '<span style="mso-spacerun:
+Geophys. Res., 2001, 576-591). <span style="mso-spacerun:
+yes"> </span>Also '<span style="mso-spacerun:
yes"> </span>//<span
style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
@@ -7424,9 +7423,10 @@ yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>' 2XCO2 simulation
-described in Dorkey et al. '<span style="mso-spacerun: yes">
-</span>//<span style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>' 2XCO2
+simulation described in Dorkey et al. '<span style="mso-spacerun:
+yes"> </span>//<span style="mso-spacerun: yes">
+</span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -7440,8 +7440,8 @@ style="mso-spacerun: yes">
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes">
-</span>parent_experiment_id="N/A",branch_time=bt)<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>parent_experiment_id="N/A",branch_time=bt)<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -7505,8 +7505,7 @@ yes"> </span><o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span><o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -7534,9 +7533,9 @@ yes"> &nb
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes">
-</span>units='degrees_east',<span style="mso-spacerun:
-yes"> </span>&<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>units='degrees_east',<span
+style="mso-spacerun: yes">
+</span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -7581,8 +7580,9 @@ style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes">
-</span>length=lat,<span style="mso-spacerun:
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>length=lat,<span
+style="mso-spacerun:
yes">
</span>&<o:p></o:p></span></p>
@@ -7624,8 +7624,8 @@ yes"> </span>&<o:p></o:p></span></p>
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes">
</span>length=lon,<span style="mso-spacerun:
-yes">
-</span>&<o:p></o:p></span></p>
+yes">
+</span><span style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -7671,8 +7671,9 @@ yes"> </span>&<o:p></o:p></span></p>
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes">
</span>units='Pa',<span style="mso-spacerun:
-yes">
-</span>&<o:p></o:p></span></p>
+yes"> </span><span
+style="mso-spacerun:
+yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -7728,8 +7729,9 @@ yes"> </span>&<o
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>units='days
-since 2030-1-1',<span style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
+style="mso-spacerun: yes">
+</span>units='days since 2030-1-1',<span style="mso-spacerun: yes">
+</span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -7924,8 +7926,8 @@ style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>zaxis_id=ilev,<span
-style="mso-spacerun:
+style="mso-spacerun: yes">
+</span>zaxis_id=ilev,<span style="mso-spacerun:
yes">
</span>& <o:p></o:p></span></p>
@@ -7966,8 +7968,8 @@ style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>zaxis_id=ilev,<span
-style="mso-spacerun:
+style="mso-spacerun: yes">
+</span>zaxis_id=ilev,<span style="mso-spacerun:
yes">
</span>&<o:p></o:p></span></p>
@@ -8007,8 +8009,8 @@ style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>zaxis_id=ilev,<span
-style="mso-spacerun:
+style="mso-spacerun: yes">
+</span>zaxis_id=ilev,<span style="mso-spacerun:
yes">
</span>&<o:p></o:p></span></p>
@@ -8067,7 +8069,8 @@ yes"> </span>&<o:p></o:p></span></p>
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes">
</span>units=units3d(1),<span style="mso-spacerun:
-yes"> </span>&<o:p></o:p></span></p>
+yes"> </span><span
+style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8150,8 +8153,7 @@ yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes">
-</span>original_name=varin3d(m))<o:p></o:p></span></p>
+yes"> </span>original_name=varin3d(m))<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8171,8 +8173,7 @@ style="mso-spacerun: yes"> </span>!<span style="mso-spacerun: yes">
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span><o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8216,9 +8217,10 @@ ilon, ilat, itim /), &<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span
-style="mso-spacerun: yes"> </span>missing_value=1.0e28,<span
-style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
+style="mso-spacerun:
+yes">
+</span>missing_value=1.0e28,<span style="mso-spacerun:
+yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8241,7 +8243,8 @@ style="mso-spacerun: yes"> </span>else<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes"> </span>var2d_ids(m) =
-cmor_variable(<span style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
+cmor_variable(<span style="mso-spacerun: yes"> </span><span
+style="mso-spacerun: yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8260,8 +8263,8 @@ yes"> </span>& <o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes"> </span>units=units2d(m),<span
-style="mso-spacerun:
+yes">
+</span>units=units2d(m),<span style="mso-spacerun:
yes"> </span>& <o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
@@ -8372,8 +8375,8 @@ table A1c and table A1a fields and store them in <o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes"> </span>! data3d and data2d,
-respectively.<span style="mso-spacerun: yes"> </span>In addition a
-user-written code <o:p></o:p></span></p>
+respectively.<span style="mso-spacerun: yes"> </span>In addition a user-written
+code <o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8456,18 +8459,18 @@ style="mso-spacerun: yes">
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes">
-</span>data<span style="mso-spacerun:
-yes"> </span>=
-data3d,<span style="mso-spacerun: yes">
+</span>data<span style="mso-spacerun: yes"> </span><span
+style="mso-spacerun: yes"> </span>= data3d,<span
+style="mso-spacerun:
+yes">
</span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes">
</span>ntimes_passed = 1,<span style="mso-spacerun:
-yes">
-</span><span style="mso-spacerun:
-yes"> </span>&<o:p></o:p></span></p>
+yes">
+</span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8505,11 +8508,10 @@ yes"> &nb
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span
-style="mso-spacerun: yes"> </span>var_id<span style="mso-spacerun:
+style="mso-spacerun: yes">
+</span>var_id<span style="mso-spacerun:
yes"> </span>= zfactor_id,<span
-style="mso-spacerun:
-yes">
+style="mso-spacerun: yes">
</span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
@@ -8524,8 +8526,8 @@ data2d,<span style="mso-spacerun: yes">  
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes">
</span>ntimes_passed = 1,<span style="mso-spacerun:
-yes">
-</span>&<o:p></o:p></span></p>
+yes"> </span><span style="mso-spacerun:
+yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8537,9 +8539,9 @@ yes"> &nb
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span
-style="mso-spacerun: yes"> </span>time_bnds<span style="mso-spacerun:
-yes"> </span>= bnds_time,<span style="mso-spacerun:
+style="mso-spacerun: yes">
+</span>time_bnds<span style="mso-spacerun: yes">
+</span>= bnds_time,<span style="mso-spacerun:
yes">
</span>&<o:p></o:p></span></p>
@@ -8643,12 +8645,12 @@ style="mso-spacerun: yes">
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
+style="mso-spacerun: yes"> </span><span
style="mso-spacerun:
-yes">
-</span>data<span style="mso-spacerun:
-yes"> </span>= data3d,<span
+yes"> </span>data<span
style="mso-spacerun:
-yes">
+yes"> </span>=
+data3d,<span style="mso-spacerun: yes">
</span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
@@ -8656,9 +8658,8 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
style="mso-spacerun:
yes">
</span>ntimes_passed = 1,<span style="mso-spacerun:
-yes"> </span><span
-style="mso-spacerun:
-yes"> </span>&<o:p></o:p></span></p>
+yes">
+</span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8681,8 +8682,8 @@ style="mso-spacerun: yes"> </span><o:p
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>IF
-(error_flag < 0) THEN<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span
+style="mso-spacerun: yes"> </span>IF (error_flag < 0) THEN<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8693,8 +8694,8 @@ write diagnostic messages to standard output device<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes"> </span>write(*,*)
-' Error encountered writing IPCC Table A1c ' &<o:p></o:p></span></p>
+yes">
+</span>write(*,*) ' Error encountered writing IPCC Table A1c ' &<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8790,8 +8791,8 @@ append a single time sample of data for a single field to <o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span>! the appropriate netCDF file.<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>!
+the appropriate netCDF file.<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><o:p> </o:p></span></p>
@@ -8809,8 +8810,9 @@ style="mso-spacerun:
yes">
</span>var_id<span style="mso-spacerun:
yes"> </span>= var2d_ids(m),<span
-style="mso-spacerun: yes">
-</span>&<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span
+style="mso-spacerun:
+yes"> </span>&<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8891,8 +8893,7 @@ IF<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span><o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -8933,8 +8934,7 @@ style="mso-spacerun: yes"> </span>print*, ' '<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>print*,
-'******************************'<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>print*, '******************************'<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -9012,8 +9012,7 @@ read_time(it, time, time_bnds)<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span>int it;<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>int it;<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -9160,8 +9159,8 @@ style="mso-spacerun: yes"> </span>for (j=0;j<n1;j++) {<o:p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>for
-(i=0;i<n0;i++) {<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>for (i=0;i<n0;i++)
+{<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -9542,8 +9541,8 @@ style="mso-spacerun: yes"> </span>x[i]=i;<o:p></o:
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes">
-</span>lon_coords[i+j*lon] = lon0+delta_lon*(j+1+i);<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>lon_coords[i+j*lon]
+= lon0+delta_lon*(j+1+i);<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -9572,8 +9571,8 @@ style="mso-spacerun: yes">
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes">
-</span>lon_vertices[i*4+j*lon*4+1] = lon_coords[i+j*lon];<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>lon_vertices[i*4+j*lon*4+1]
+= lon_coords[i+j*lon];<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -9597,8 +9596,9 @@ style="mso-spacerun: yes">
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes">
-</span>lat_vertices[i*4+j*lon*4+1] = lat_coords[i+j*lon]-delta_lat;<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>lat_vertices[i*4+j*lon*4+1] =
+lat_coords[i+j*lon]-delta_lat;<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -9703,8 +9703,8 @@ output starting with nominal date of January 2030",<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun: yes">
-</span>"Model described by Koder and Tolkien (J. Geophys. Res., 2001,
-576-591).<span style="mso-spacerun: yes"> </span>Also see
+</span>"Model described by Koder and Tolkien (J. Geophys. Res., 2001, 576-591).<span
+style="mso-spacerun: yes"> </span>Also see
http://www.GICC.su/giccm/doc/index.html<span style="mso-spacerun: yes">
</span>2XCO2 simulation described in Dorkey et al. '(Clim. Dyn., 2003,
323-357.)",<o:p></o:p></span></p>
@@ -9738,7 +9738,8 @@ cmor_load_table("Tables/CMIP5_Amon",&tables[1]);<o:p></o:p></span>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>printf("Test code: ok load cmor table(s)\n");<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>printf("Test code: ok load cmor
+table(s)\n");<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -9764,8 +9765,8 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>/* first define grid axes (x/y/rlon/rlat,etc...
-*/<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>/* first define grid axes
+(x/y/rlon/rlat,etc... */<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -9779,7 +9780,8 @@ style="mso-spacerun: yes"> </span>printf("Test code: ok got axes id:
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>ierr =
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>ierr =
cmor_axis(&myaxes[1],"y","m",lat,&y[0],'d',NULL,0,NULL);<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
@@ -9979,8 +9981,8 @@ style="mso-spacerun: yes"> </span>read_2d_input_files(i,
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>//for(j=0;j<10;j++) printf("Test
-code: %i out of %i : %lf\n",j,9,data2d[j]);<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>//for(j=0;j<10;j++)
+printf("Test code: %i out of %i : %lf\n",j,9,data2d[j]);<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -10110,9 +10112,8 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes"> </span><span
-style="mso-spacerun: yes"> </span>units=
-'degrees_east',<o:p></o:p></span></p>
+yes">
+</span>units= 'degrees_east',<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -10198,7 +10199,8 @@ style="mso-spacerun: yes"> </span>delta_lon = 10.;<o:p></o:p><
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>delta_lat = 10.;<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>delta_lat = 10.;<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -10210,7 +10212,8 @@ style="mso-spacerun: yes"> </span>x = numpy.arange(lon)<o:p></
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span>lon_coords = numpy.zeros((lat,lon))<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>lon_coords =
+numpy.zeros((lat,lon))<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -10289,9 +10292,9 @@ yes">
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun:
-yes">
-</span>lat_vertices[j,i,1] = lat_coords[j,i]-delta_lat;<o:p></o:p></span></p>
+style="mso-spacerun: yes">
+</span><span style="mso-spacerun:
+yes"> </span>lat_vertices[j,i,1] = lat_coords[j,i]-delta_lat;<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -10449,8 +10452,7 @@ Nat",<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes">
-</span>institute_id="pcmdi",<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>institute_id="pcmdi",<o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -10541,9 +10543,8 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes">
-</span><span style="mso-spacerun:
-yes"> </span>latitude = lat_coords, <o:p></o:p></span></p>
+yes">
+</span>latitude = lat_coords, <o:p></o:p></span></p>
<p class=MsoNormal style='margin-left:.5in;text-indent:-.5in'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -10771,9 +10772,9 @@ style="mso-spacerun: yes"> </span><o:p></o:p></span></b></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>cmor_version:
-0.8<span style="mso-spacerun: yes">
-</span><span style="mso-spacerun: yes"> </span>! version of CMOR that can
-read this table<o:p></o:p></span></p>
+0.8<span style="mso-spacerun:
+yes"> </span>! version of CMOR
+that can read this table<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>cf_version:<span
@@ -10882,9 +10883,11 @@ official version.<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes">
-</span>!<span style="mso-spacerun: yes"> </span>should be set to
-number of non-blank <o:p></o:p></span></p>
+yes">
+</span><span style="mso-spacerun:
+yes"> </span>!<span
+style="mso-spacerun: yes"> </span>should be set to number of
+non-blank <o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -10909,8 +10912,10 @@ of the output time <o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes">
-</span>!<span style="mso-spacerun: yes"> </span>coordinate.<o:p></o:p></span></p>
+yes"> </span><span
+style="mso-spacerun:
+yes"> </span>!<span
+style="mso-spacerun: yes"> </span>coordinate.<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>missing_value:
@@ -10919,10 +10924,10 @@ value used to indicate a missing value<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span>!<span
-style="mso-spacerun: yes"> </span>in arrays output by netCDF as
-32-bit IEEE <o:p></o:p></span></p>
+style="mso-spacerun:
+yes">
+</span>!<span style="mso-spacerun: yes"> </span>in arrays output by
+netCDF as 32-bit IEEE <o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -11264,11 +11269,11 @@ used in the formula:<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
-style="mso-spacerun: yes"> </span><span
style="mso-spacerun:
-yes"> </span>!<span
-style="mso-spacerun: yes"> </span>eps =<span
-style="mso-spacerun: yes"> </span>MIN(( tol*interval between grid-points)<o:p></o:p></span></p>
+yes">
+</span>!<span style="mso-spacerun: yes"> </span>eps
+=<span style="mso-spacerun: yes"> </span>MIN(( tol*interval between
+grid-points)<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -11279,9 +11284,9 @@ yes"> &nb
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!value:<span
-style="mso-spacerun:
-yes">
-</span>! of scalar (singleton) dimension <o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>!
+of scalar (singleton) dimension <o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!bounds_values:<span
@@ -11331,9 +11336,9 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!
-<span style="mso-spacerun: yes"> </span>Override default
-argument specifications for cmor_variable<o:p></o:p></span></p>
+style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!<span
+style="mso-spacerun: yes"> </span>Override default argument
+specifications for cmor_variable<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!------------<o:p></o:p></span></p>
@@ -11345,10 +11350,10 @@ style="mso-spacerun: yes">
</span>file_suffix missing_value tolerance <o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!<span
-style="mso-spacerun:
-yes">
-</span>original_name history comment positive<o:p></o:p></span></p>
+style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!
+<span style="mso-spacerun:
+yes"> </span>original_name
+history comment positive<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!required:<span
@@ -11446,10 +11451,9 @@ dimension(s) should appear<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes">
-</span><span style="mso-spacerun:
-yes"> </span>!<span
-style="mso-spacerun: yes"> </span>last in list)<o:p></o:p></span></p>
+yes">
+</span>!<span style="mso-spacerun: yes">
+</span>last in list)<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!out_name:<span
@@ -11607,9 +11611,11 @@ yes"> &nb
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes">
-</span>!<span style="mso-spacerun: yes"> </span>longitudes are in proper
-range.<span style="mso-spacerun: yes"> </span>The<o:p></o:p></span></p>
+yes">
+</span><span style="mso-spacerun:
+yes"> </span>!<span
+style="mso-spacerun: yes"> </span>longitudes are in proper range.<span
+style="mso-spacerun: yes"> </span>The<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
@@ -11843,8 +11849,9 @@ style="mso-spacerun: yes"> </span>air_pressure<o:p></o:p></spa
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>units:<span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span>Pa <o:p></o:p></span></p>
+style="mso-spacerun:
+yes">
+</span>Pa <o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>axis:<span
@@ -12061,8 +12068,8 @@ style="mso-spacerun: yes"> </span>height<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>units:<span
style="mso-spacerun:
-yes">
-</span>m<o:p></o:p></span></p>
+yes"> </span><span
+style="mso-spacerun: yes"> </span>m<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>axis:<span
@@ -12110,9 +12117,8 @@ style="mso-spacerun: yes"> </span>30.<
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>value:<span
-style="mso-spacerun:
-yes">
-</span>10.<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span
+style="mso-spacerun: yes"> </span>10.<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!----------------------------------<span
@@ -12624,8 +12630,8 @@ air_temperature<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>units:<span
-style="mso-spacerun: yes">
-</span>K<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span
+style="mso-spacerun: yes"> </span>K<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>cell_methods:<span
@@ -12662,8 +12668,8 @@ style="mso-spacerun: yes">
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>valid_max:<span
-style="mso-spacerun: yes">
-</span>350.<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>350.<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>ok_min_mean_abs:<span
@@ -12835,8 +12841,8 @@ yes"> </span>0.0<o:p></o:p
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>valid_max:<span
-style="mso-spacerun: yes">
-</span><span style="mso-spacerun: yes"> </span>100.0<o:p></o:p></span></p>
+style="mso-spacerun:
+yes"> </span>100.0<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>ok_min_mean_abs:<span
@@ -13180,8 +13186,9 @@ of the output time <o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><span
style="mso-spacerun:
-yes">
-</span>!<span style="mso-spacerun: yes"> </span>coordinate.<o:p></o:p></span></p>
+yes">
+</span><span style="mso-spacerun: yes"> </span>!<span
+style="mso-spacerun: yes"> </span>coordinate.<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'><o:p> </o:p></span></p>
@@ -13422,8 +13429,7 @@ yes"> </span>! up or down
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>long_name:<span
-style="mso-spacerun: yes">
-</span>pressure<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>pressure<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!----------------------------------<o:p></o:p></span></p>
@@ -13504,10 +13510,10 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>axis:<span
-style="mso-spacerun: yes"> </span><span
-style="mso-spacerun: yes"> </span>Z<span
style="mso-spacerun:
yes">
+</span>Z<span style="mso-spacerun:
+yes">
</span>! X, Y, Z, T (default: undeclared)<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
@@ -13699,8 +13705,8 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>out_name:<span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span>time<o:p></o:p></span></p>
+style="mso-spacerun: yes">
+</span>time<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>stored_direction:
@@ -13927,11 +13933,11 @@ yes">
</span>double<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>value:<span
+style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>value:
+<span style="mso-spacerun:
+yes"> </span>10.<span
style="mso-spacerun:
yes">
-</span>10.<span style="mso-spacerun:
-yes">
</span>! of scalar (singleton) dimension <o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
@@ -14186,9 +14192,8 @@ style="mso-spacerun: yes"> </span>20.<
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>formula:<span
-style="mso-spacerun:
-yes"> </span>p(k) = p0 *
-exp(-lev(k))<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>p(k) = p0 * exp(-lev(k))<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>z_factors:<span
@@ -14258,8 +14263,9 @@ style="mso-spacerun: yes"> </span>atmosphere_sigma_coordinate<
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>axis:<span
-style="mso-spacerun: yes">
-</span><span style="mso-spacerun: yes"> </span>Z<o:p></o:p></span></p>
+style="mso-spacerun:
+yes">
+</span>Z<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>positive:<span
@@ -14301,8 +14307,7 @@ decreasing<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>valid_min:<span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span>0.0<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>0.0<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>valid_max:<span
@@ -14352,9 +14357,9 @@ This coordinate is dimensionless and varies from a small value at the model top
to 1.0 at the surface.<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!<span
-style="mso-spacerun: yes"> </span>The values of a(k)+ b(k), which appear
-in the formula below, should be stored as standard_hybrid_sigma.<span
+style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!
+<span style="mso-spacerun: yes"> </span>The values of a(k)+ b(k), which
+appear in the formula below, should be stored as standard_hybrid_sigma.<span
style="mso-spacerun: yes"> </span><o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
@@ -14508,7 +14513,8 @@ style='mso-tab-count:1'> </span><o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>standard_name:<span
-style="mso-spacerun: yes"> </span>atmosphere_hybrid_sigma_pressure_coordinate<o:p></o:p></span></p>
+style="mso-spacerun: yes">
+</span>atmosphere_hybrid_sigma_pressure_coordinate<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>units:<span
@@ -15446,8 +15452,8 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>dimensions:<span
-style="mso-spacerun: yes"> </span>longitude
-latitude time height2m<o:p></o:p></span></p>
+style="mso-spacerun: yes">
+</span>longitude latitude time height2m<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>out_name:<span
@@ -15544,9 +15550,10 @@ style="mso-spacerun:
yes"> </span>tasmin<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>type:
-<span style="mso-spacerun:
-yes"> </span>real<o:p></o:p></span></p>
+style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>type:<span
+style="mso-spacerun:
+yes">
+</span>real<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!----------------------------------<o:p></o:p></span></p>
@@ -15632,9 +15639,8 @@ yes"> </span>pr<o:p></o:p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>type:<span
-style="mso-spacerun:
-yes">
-</span>real<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>real<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!----------------------------------<o:p></o:p></span></p>
@@ -15677,8 +15683,7 @@ style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier N
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>standard_name:<span
-style="mso-spacerun: yes">
-</span>surface_upward_latent_heat_flux<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span>surface_upward_latent_heat_flux<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>units:<span
@@ -15718,8 +15723,8 @@ style="mso-spacerun: yes">
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>out_name:<span
-style="mso-spacerun: yes"> </span><span
-style="mso-spacerun: yes"> </span>hfls<o:p></o:p></span></p>
+style="mso-spacerun:
+yes"> </span>hfls<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>type:<span
@@ -16059,8 +16064,8 @@ starting with January, even if the values don't vary seasonally.<span
style="mso-spacerun: yes"> </span>When calling CMOR, identify this
variable as co2Clim, not co2.<span style="mso-spacerun: yes">
</span>If<span style="mso-spacerun: yes"> </span>CO2 is spatially
-uniform, omit this field, but report Total Atmospheric Mass of CO2 (see the
-table entry after the next).<o:p></o:p></span></p>
+uniform, omit this field, but report Total Atmospheric Mass of CO2 (see the table
+entry after the next).<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!----------------------------------<o:p></o:p></span></p>
@@ -16133,8 +16138,8 @@ style="mso-spacerun: yes"> </span>time: mean<o:p><
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>long_name:<span
-style="mso-spacerun: yes">
-</span>Total Atmospheric Mass of CO2<o:p></o:p></span></p>
+style="mso-spacerun: yes"> </span><span style="mso-spacerun:
+yes"> </span>Total Atmospheric Mass of CO2<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>comment:<span
@@ -16162,9 +16167,9 @@ style="mso-spacerun: yes">
</span>time<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
-style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>out_name:<span
-style="mso-spacerun:
-yes"> </span>co2mass<o:p></o:p></span></p>
+style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>out_name:
+<span style="mso-spacerun:
+yes"> </span>co2mass<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>type:<span
@@ -16218,9 +16223,8 @@ within years time: mean over years<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>long_name:<span
-style="mso-spacerun: yes"> </span><span style="mso-spacerun:
-yes"> </span>Total Atmospheric Mass of
-CO2<o:p></o:p></span></p>
+style="mso-spacerun: yes">
+</span>Total Atmospheric Mass of CO2<o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>comment:<span
@@ -16231,8 +16235,8 @@ the CO2 does not vary from one year to the next. Report 12 monthly values,
starting with January, even if the values don't vary seasonally.<span
style="mso-spacerun: yes"> </span>When calling CMOR, identify this
variable as co2massClim, not co2mass.<span style="mso-spacerun: yes">
-</span>If CO2 is spatially nonuniform, omit this field, but report Mole Fraction
-of CO2 (see the table entry before the previous one). <o:p></o:p></span></p>
+</span>If CO2 is spatially nonuniform, omit this field, but report Mole
+Fraction of CO2 (see the table entry before the previous one). <o:p></o:p></span></p>
<p class=MsoNormal style='mso-layout-grid-align:none;text-autospace:none'><span
style='font-size:9.0pt;font-family:"Courier New";mso-bidi-font-family:"Courier New"'>!----------------------------------<o:p></o:p></span></p>
@@ -16377,9 +16381,9 @@ style='font-size:10.0pt'> <span style='background:silver;mso-highlight:silver'>N
For CMIP5 model_id and forcing are required. For backward compatibility with
the original CMOR code, the model_id and forcing are “optionally” required by
CMOR2, meaning they become mandatory only if they appear as
-“required_global_attributes” in the CMOR table. For this reason, a call to
-cmor_dataset without these would not return an error until a call is made to
-cmor_write, since it is table-dependent. <o:p></o:p></span></span></p>
+“required_global_attributes” in the CMOR table. For this reason, a call to cmor_dataset
+without these would not return an error until a call is made to cmor_write,
+since it is table-dependent. <o:p></o:p></span></span></p>
<p class=MsoFootnoteText><o:p> </o:p></p>
diff --git a/Doc/cmor_users_guide.pdf b/Doc/cmor_users_guide.pdf
index a62ab6e..9aa9d2f 100644
Binary files a/Doc/cmor_users_guide.pdf and b/Doc/cmor_users_guide.pdf differ
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 910bc69..64d9966 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,6 @@
+2010-09-01 : fixed a bug on mac 32bit when reading in net3 version string
+2010-09-01 : some vars with grid and singleton dims were wrongly analyzed by cmor_variable has not being defined with the right number of dimmensions.
+2010-09-01 : updated doc. Was saying you can pass "none" for units when it really is: ""
2010-08-24 : when writing time only variables, the time_bnds would fail to write if passed at cmor_write time.
2010-08-23 : tagging 2.2
2010-08-23 : DRS was wrongly constructed for table Oclim
diff --git a/Src/cmor.c b/Src/cmor.c
index dc2f99f..df6077b 100644
--- a/Src/cmor.c
+++ b/Src/cmor.c
@@ -345,6 +345,7 @@ int cmor_have_NetCDF3(void) {
char version[50];
int major;
strncpy(version,nc_inq_libvers(),50);
+ if (version[0]!='"') return 1;
sscanf(version,"%*c%1d%*s",&major);
if (major!=3) return 1;
return 0;
diff --git a/Src/cmor_variables.c b/Src/cmor_variables.c
index d48ee0c..3397eb1 100644
--- a/Src/cmor_variables.c
+++ b/Src/cmor_variables.c
@@ -731,7 +731,7 @@ int cmor_variable(int *var_id, char *name, char *units, int ndims, int axes_ids[
if (refvar.ndims+aint!=lndims) {
lndims=0;
/* ok before we panic we check if there is a "dummy" dim */
- j=refvar.ndims-ndims+aint;
+ j=refvar.ndims-olndims+aint;
for (i=0;i<refvar.ndims;i++) {
/* printf("ok none matchng # of dims, i: %d, id: %s, value: %lf, lndims is: %d\n",i,cmor_tables[CMOR_TABLE].axes[refvar.dimensions[i]].id,cmor_tables[CMOR_TABLE].axes[refvar.dimensions[i]].value,olndims); */
if (cmor_tables[CMOR_TABLE].axes[refvar.dimensions[i]].value!=1.e20) {
diff --git a/Test/test_python_joerg_6.py b/Test/test_python_joerg_6.py
new file mode 100644
index 0000000..978f9bc
--- /dev/null
+++ b/Test/test_python_joerg_6.py
@@ -0,0 +1,41 @@
+ ntables(2) = CMIP5_grid,
+! ntables(1) = CMIP5_Omon,
+! the index i runs through a number of variables
+
+ call cmor_set_table(table_id=ntables(2))
+ axes(1) = cmor_axis( &
+ table_entry = 'i_index', &
+ length = nlon, &
+ coord_vals = xii, &
+ units = '1')
+
+ axes(2) = cmor_axis( &
+ table_entry = 'j_index', &
+ length = nlat, &
+ coord_vals = yii, &
+ units = '1')
+
+ grid_id = cmor_grid( &
+ axis_ids = axes, &
+ latitude = olat_val, &
+ longitude = olon_val, &
+ latitude_vertices = bnds_olat, &
+ longitude_vertices = bnds_olon)
+
+ call cmor_set_table(table_id=ntables(1))
+
+ var_ids = cmor_variable( &
+ table_entry = vartabin(1,i), & ! epc100
+ units = vartabin(2,i), & ! mol m-2 s-1
+ positive = vartabin(3,i), & ! down
+ axis_ids = (/ tim_id, grid_id /), &
+ missing_value = miss_val(i) )
+
+ error_flag = cmor_write( &
+ var_id = var_ids, &
+ data = ar5all2d(:,:,:,i), &
+ ntimes_passed = ntim, &
+ file_suffix = SUFFIX, &
+ time_vals = time, &
+ time_bnds = bnds_time)
+
diff --git a/Test/test_python_joerg_8.py b/Test/test_python_joerg_8.py
new file mode 100644
index 0000000..0a6cb04
--- /dev/null
+++ b/Test/test_python_joerg_8.py
@@ -0,0 +1,97 @@
+from test_python_common import * # common subroutines
+
+import cmor._cmor
+import os
+
+pth = os.path.split(os.path.realpath(os.curdir))
+if pth[-1]=='Test':
+ ipth = opth = '.'
+else:
+ ipth = opth = 'Test'
+
+
+myaxes=numpy.zeros(9,dtype='i')
+myaxes2=numpy.zeros(9,dtype='i')
+myvars=numpy.zeros(9,dtype='i')
+
+
+cmor.setup(inpath=ipth,set_verbosity=cmor.CMOR_NORMAL, netcdf_file_action = cmor.CMOR_REPLACE, exit_control = cmor.CMOR_EXIT_ON_MAJOR);
+cmor.dataset(
+ outpath = opth,
+ experiment_id = "historical",
+ institution = "GICC (Generic International Climate Center, Geneva, Switzerland)",
+ source = "GICCM1 2002: atmosphere: GICAM3 (gicam_0_brnchT_itea_2, T63L32); ocean: MOM (mom3_ver_3.5.2, 2x3L15); sea ice: GISIM4; land: GILSM2.5",
+ calendar = "standard",
+ realization = 1,
+ contact = "Rusty Koder (koder at middle_earth.net)",
+ history = "Output from archive/giccm_03_std_2xCO2_2256.",
+ comment = "Equilibrium reached after 30-year spin-up after which data were output starting with nominal date of January 2030",
+ references = "Model described by Koder and Tolkien (J. Geophys. Res., 2001, 576-591). Also see http://www.GICC.su/giccm/doc/index.html 2XCO2 simulation described in Dorkey et al. '(Clim. Dyn., 2003, 323-357.)",
+ leap_year=0,
+ leap_month=0,
+ month_lengths=None,
+ model_id="GICCM1",
+ forcing="Ant, Nat",
+ institute_id="pcmdi",
+ parent_experiment_id="piControl",branch_time=18336.33)
+
+tables=[]
+a = cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_grids")
+tables.append(a)
+tables.append(cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_Omon"))
+print 'Tables ids:',tables
+
+cmor.set_table(tables[0])
+
+x,y,lon_coords,lat_coords,lon_vertices,lat_vertices = gen_irreg_grid(lon,lat)
+
+
+
+myaxes[0] = cmor.axis(table_entry = 'y',
+ units = 'm',
+ coord_vals = y)
+myaxes[1] = cmor.axis(table_entry = 'x',
+ units = 'm',
+ coord_vals = x)
+
+grid_id = cmor.grid(axis_ids = myaxes[:2],
+ latitude = lat_coords,
+ longitude = lon_coords,
+ latitude_vertices = lat_vertices,
+ longitude_vertices = lon_vertices)
+print 'got grid_id:',grid_id
+myaxes[2] = grid_id
+
+## mapnm = 'lambert_conformal_conic'
+## params = [ "standard_parallel1",
+## "longitude_of_central_meridian","latitude_of_projection_origin",
+## "false_easting","false_northing","standard_parallel2" ]
+## punits = ["","","","","","" ]
+## pvalues = [-20.,175.,13.,8.,0.,20. ]
+## cmor.set_grid_mapping(grid_id=myaxes[2],
+## mapping_name = mapnm,
+## parameter_names = params,
+## parameter_values = pvalues,
+## parameter_units = punits)
+
+cmor.set_table(tables[1])
+myaxes[3] = cmor.axis(table_entry = 'time',
+ units = 'months since 1980')
+
+pass_axes = [myaxes[3],myaxes[2]]
+
+print 'ok going to cmorvar'
+myvars[0] = cmor.variable( table_entry = 'epc100',
+ units = 'W m-2',
+ axis_ids = pass_axes,
+ positive = 'down',
+ original_name = 'HFLS',
+ history = 'no history',
+ comment = 'no future'
+ )
+for i in range(ntimes):
+ data2d = read_2d_input_files(i, varin2d[0], lat,lon)
+ print 'writing time: ',i,data2d.shape,data2d
+ print Time[i],bnds_time[2*i:2*i+2]
+ cmor.write(myvars[0],data2d,1,time_vals=Time[i],time_bnds=bnds_time[2*i:2*i+2])
+cmor.close()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list