Skip to content

Commit

Permalink
Merge pull request #76 from AleksiNummelin/feature_highres
Browse files Browse the repository at this point in the history 
Feature highres
  • Loading branch information
@matsbn
matsbn authored Mar 26, 2021
2 parents c8cd1cd + 1b22c7d commit 0c7f492
Show file tree
Hide file tree
Showing 7 changed files with 1,565 additions and 2 deletions.
1 change: 1 addition & 0 deletions bld/tnx0.125v4/kdm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
53
548 changes: 548 additions & 0 deletions bld/tnx0.125v4/patch.input.1532
View file

Large diffs are not rendered by default.

660 changes: 660 additions & 0 deletions bld/tnx0.125v4/patch.input.1625
View file

Large diffs are not rendered by default.

276 changes: 276 additions & 0 deletions bld/tnx0.125v4/patch.input.521
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,276 @@
npes npe mpe idm jdm ibig jbig nreg minsea maxsea avesea
521 10 64 2880 2165 288 34 2 0 9792 7039

ispt( 1) = 0 366 0 0 0 0 0 2038
2305 0
iipe( 1) = 0 71 0 0 0 0 0 267
18 0
ispt( 2) = 0 316 0 0 0 0 0 2026
2305 0
iipe( 2) = 0 142 0 0 0 0 0 279
87 0
ispt( 3) = 283 289 0 0 0 0 0 2017
2305 0
iipe( 3) = 6 211 0 0 0 0 0 288
107 0
ispt( 4) = 240 289 0 0 0 0 0 2017
2305 0
iipe( 4) = 49 230 0 0 0 0 0 288
179 0
ispt( 5) = 223 289 0 0 0 0 0 2021
2305 2678
iipe( 5) = 66 257 0 0 0 0 0 284
275 115
ispt( 6) = 21 289 0 0 0 0 0 2039
2305 2593
iipe( 6) = 268 275 0 0 0 0 0 266
288 198
ispt( 7) = 1 289 577 0 0 0 0 2074
2305 2593
iipe( 7) = 288 288 49 0 0 0 0 231
288 288
ispt( 8) = 1 289 577 0 0 0 2009 2017
2305 2593
iipe( 8) = 288 288 180 0 0 0 8 288
288 288
ispt( 9) = 1 289 577 865 1301 0 1961 2017
2305 2593
iipe( 9) = 288 288 288 179 44 0 56 288
288 288
ispt( 10) = 1 289 577 865 1189 0 1877 2017
2305 2593
iipe( 10) = 288 288 288 264 201 0 140 288
288 288
ispt( 11) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 11) = 288 288 288 288 288 288 288 288
288 288
ispt( 12) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 12) = 288 288 288 288 288 288 288 288
288 288
ispt( 13) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 13) = 288 288 288 288 288 288 288 288
288 288
ispt( 14) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 14) = 288 288 288 288 288 288 288 288
288 288
ispt( 15) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 15) = 288 288 288 288 288 288 288 288
288 288
ispt( 16) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 16) = 288 288 288 288 288 288 288 288
288 288
ispt( 17) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 17) = 288 288 288 288 288 288 288 288
288 288
ispt( 18) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 18) = 288 288 288 288 288 288 288 288
288 288
ispt( 19) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 19) = 288 288 288 288 288 288 288 288
288 288
ispt( 20) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 20) = 288 288 288 288 288 288 288 288
288 288
ispt( 21) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 21) = 288 288 288 288 288 288 288 288
288 288
ispt( 22) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 22) = 288 288 288 288 288 288 288 288
288 288
ispt( 23) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 23) = 288 288 288 288 288 288 288 288
288 288
ispt( 24) = 1 289 577 865 1153 1441 1729 2017
2305 2593
iipe( 24) = 288 288 288 288 288 288 288 288
288 288
ispt( 25) = 1 307 577 865 1153 1441 1944 2017
2305 2593
iipe( 25) = 154 270 288 288 288 204 73 288
288 288
ispt( 26) = 1 331 577 981 1153 1441 1926 2017
2305 2593
iipe( 26) = 158 246 269 172 288 195 91 288
288 288
ispt( 27) = 1 354 577 998 1153 1441 1893 2017
2305 2593
iipe( 27) = 160 223 262 155 288 252 124 288
288 288
ispt( 28) = 1 400 577 1000 1153 1441 1747 2017
2305 2593
iipe( 28) = 160 177 248 153 288 282 270 288
288 288
ispt( 29) = 1 408 577 1043 1153 1441 1729 2017
2305 2593
iipe( 29) = 125 169 256 110 288 288 288 288
288 288
ispt( 30) = 1 421 577 1034 1153 1441 1729 2017
2305 2593
iipe( 30) = 103 156 256 119 288 288 288 288
288 288
ispt( 31) = 1 363 577 1030 1153 1441 1729 2017
2305 2593
iipe( 31) = 84 214 248 123 288 288 288 288
288 288
ispt( 32) = 1 319 577 1041 1153 1441 1729 2017
2305 2593
iipe( 32) = 91 258 229 112 288 288 288 288
288 288
ispt( 33) = 1 289 577 1072 1153 1441 1729 2017
2305 2593
iipe( 33) = 288 288 224 81 288 288 288 288
288 288
ispt( 34) = 1 289 577 1108 1153 1441 1729 2017
2305 2593
iipe( 34) = 288 288 188 45 288 288 288 288
288 288
ispt( 35) = 1 289 577 1052 1153 1441 1729 2017
2305 2593
iipe( 35) = 288 288 36 101 288 288 288 288
288 288
ispt( 36) = 1 289 577 1025 1153 1441 1729 2017
2305 2593
iipe( 36) = 288 288 19 128 288 288 288 288
288 288
ispt( 37) = 1 289 577 1012 1164 1441 1729 2017
2305 2593
iipe( 37) = 288 288 21 45 277 288 288 288
288 288
ispt( 38) = 1 289 577 994 1153 1441 1729 2017
2305 2593
iipe( 38) = 288 288 30 159 288 288 288 288
288 288
ispt( 39) = 1 289 577 979 1153 1677 1729 2017
2305 2593
iipe( 39) = 288 288 67 174 101 52 288 288
288 288
ispt( 40) = 1 289 577 865 0 1687 1729 2017
2305 2593
iipe( 40) = 288 288 288 264 0 42 288 288
288 288
ispt( 41) = 71 289 577 865 0 1675 1729 2017
2305 2593
iipe( 41) = 218 288 288 143 0 54 288 288
288 74
ispt( 42) = 99 289 577 865 0 1675 1729 2017
2305 2593
iipe( 42) = 190 288 288 144 0 54 288 288
288 42
ispt( 43) = 106 289 577 865 0 1664 1729 2017
2305 2593
iipe( 43) = 183 288 288 181 0 65 288 288
288 26
ispt( 44) = 110 289 577 865 0 1679 1755 2017
2305 2593
iipe( 44) = 179 288 288 184 0 39 262 288
288 12
ispt( 45) = 131 289 577 942 0 0 1778 2017
2305 2593
iipe( 45) = 158 288 256 89 0 0 239 288
288 7
ispt( 46) = 159 289 577 991 0 0 1831 2017
2305 2593
iipe( 46) = 130 288 169 31 0 0 186 288
288 5
ispt( 47) = 167 289 577 0 0 0 1853 2017
2305 2593
iipe( 47) = 122 288 195 0 0 0 164 288
288 3
ispt( 48) = 217 289 577 865 0 0 1867 2017
2305 2593
iipe( 48) = 72 288 288 3 0 0 150 288
288 8
ispt( 49) = 171 289 577 865 0 0 1854 2033
2305 2593
iipe( 49) = 118 288 288 6 0 0 146 272
288 3
ispt( 50) = 170 289 577 865 0 0 1846 2017
2305 0
iipe( 50) = 119 288 288 22 0 0 171 288
242 0
ispt( 51) = 184 289 577 865 0 0 1846 2017
2305 0
iipe( 51) = 105 288 288 46 0 0 171 288
221 0
ispt( 52) = 214 310 577 886 0 0 1893 2017
2335 0
iipe( 52) = 21 267 279 26 0 0 124 255
157 0
ispt( 53) = 0 307 577 0 0 0 0 2145
2403 0
iipe( 53) = 0 270 284 0 0 0 0 130
55 0
ispt( 54) = 0 306 577 865 0 0 0 2163
0 0
iipe( 54) = 0 271 288 75 0 0 0 100
0 0
ispt( 55) = 0 306 577 891 0 0 0 2072
0 0
iipe( 55) = 0 271 232 55 0 0 0 174
0 0
ispt( 56) = 0 316 577 865 0 0 0 2048
0 0
iipe( 56) = 0 261 288 88 0 0 0 246
0 0
ispt( 57) = 0 293 600 865 0 0 0 2030
2305 0
iipe( 57) = 0 158 265 98 0 0 0 275
66 0
ispt( 58) = 0 292 611 865 0 0 1951 2017
2305 0
iipe( 58) = 0 207 254 116 0 0 66 288
85 0
ispt( 59) = 139 303 648 865 0 0 1950 2017
2305 0
iipe( 59) = 96 207 217 130 0 0 67 288
120 0
ispt( 60) = 143 314 657 865 0 0 1945 2017
2305 0
iipe( 60) = 110 219 208 155 0 0 72 288
164 0
ispt( 61) = 151 289 655 865 0 0 1937 2017
2305 0
iipe( 61) = 138 255 210 183 0 0 80 288
174 0
ispt( 62) = 184 289 577 865 0 0 1919 2017
2305 0
iipe( 62) = 105 288 288 182 0 0 98 288
184 0
ispt( 63) = 184 289 577 865 0 0 1957 2017
2305 2593
iipe( 63) = 105 288 288 140 0 0 60 288
288 70
ispt( 64) = 1 289 577 865 0 0 1729 2017
2305 2593
iipe( 64) = 288 288 288 288 0 0 288 288
288 288

jspt( 1) = 1 34 67 100 133 166 200 234
268 302 336 370 404 438 472 506
540 574 608 642 676 710 744 778
812 846 880 914 948 982 1016 1050
1084 1118 1152 1186 1220 1254 1288 1322
1356 1390 1424 1458 1492 1526 1560 1594
1628 1662 1696 1730 1764 1798 1832 1866
1900 1934 1968 2001 2034 2067 2100 2133
jjpe( 1) = 33 33 33 33 33 34 34 34
34 34 34 34 34 34 34 34
34 34 34 34 34 34 34 34
34 34 34 34 34 34 34 34
34 34 34 34 34 34 34 34
34 34 34 34 34 34 34 34
34 34 34 34 34 34 34 34
34 34 33 33 33 33 33 33
4 changes: 2 additions & 2 deletions cime_config/buildlib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ set tracers = (`echo $BLOM_TRACER_MODULES`)
set co2type = (`echo $OCN_CO2_TYPE`)

set cpp_ocn = "-DMPI"
if ($OCN_GRID == tnx2v1 || $OCN_GRID == tnx1.5v1 || $OCN_GRID == tnx1v1 || $OCN_GRID == tnx1v3 || $OCN_GRID == tnx1v4 || $OCN_GRID == tnx0.25v1 || $OCN_GRID == tnx0.25v3 || $OCN_GRID == tnx0.25v4) then
if ($OCN_GRID == tnx2v1 || $OCN_GRID == tnx1.5v1 || $OCN_GRID == tnx1v1 || $OCN_GRID == tnx1v3 || $OCN_GRID == tnx1v4 || $OCN_GRID == tnx0.25v1 || $OCN_GRID == tnx0.25v3 || $OCN_GRID == tnx0.25v4 || $OCN_GRID == tnx0.125v4) then
set cpp_ocn = "$cpp_ocn -DARCTIC"
endif
if ($OCN_GRID == gx1v5 || $OCN_GRID == gx1v6 || $OCN_GRID == tnx1v1 || $OCN_GRID == tnx1v3 || $OCN_GRID == tnx1v4 ||$OCN_GRID == tnx0.25v1 || $OCN_GRID == tnx0.25v3 || $OCN_GRID == tnx0.25v4) then
if ($OCN_GRID == gx1v5 || $OCN_GRID == gx1v6 || $OCN_GRID == tnx1v1 || $OCN_GRID == tnx1v3 || $OCN_GRID == tnx1v4 ||$OCN_GRID == tnx0.25v1 || $OCN_GRID == tnx0.25v3 || $OCN_GRID == tnx0.25v4 || $OCN_GRID == tnx0.125v4) then
set cpp_ocn = "$cpp_ocn -DLEVITUS2X"
endif
if ($#turbclo != 0 || $#tracers != 0) then
Expand Down
40 changes: 40 additions & 0 deletions cime_config/buildnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ if ($BLOM_N_DEPOSITION == TRUE) then
set NDEPFNAME = ndep_1850_CMIP6_tnx1v4_20171106.nc
else if( $BLOM_NDEP_SCENARIO == 1850 && $OCN_GRID == tnx0.25v4) then
set NDEPFNAME = ndep_1850_CMIP6_tnx0.25v4_20190912.nc
else if( $BLOM_NDEP_SCENARIO == 1850 && $OCN_GRID == tnx0.125v4) then
set NDEPFNAME = ndep_1850_CMIP6_tnx0.125v4_20190912.nc
else if( $BLOM_NDEP_SCENARIO == 2000 && $OCN_GRID == tnx2v1) then
set NDEPFNAME = ndep_2000_CMIP6_tnx2v1_20200826.nc
else if( $BLOM_NDEP_SCENARIO == 2000 && $OCN_GRID == tnx1v4) then
Expand Down Expand Up @@ -609,6 +611,24 @@ else if ($OCN_GRID == tnx0.25v1 || $OCN_GRID == tnx0.25v3 || $OCN_GRID == tnx0.2
set EGC = 0.85
set EGMXDF = 1500.e4
set CE = 1.0
else if ($OCN_GRID == tnx0.125v4) then
set BACLIN = 300.
set BATROP = 6.
set EGMNDF = 0.0
set EGMXDF = 0.0
set EDWMTH = "'step'"
set CWBDTS = .75e-4
set CWBDLS = 25
set MDV2HI = .5
set MDV2LO = .1
set MDV4HI = 0.
set MDV4LO = 0.
set MDC2HI = 300.e4
set MDC2LO = 100.e4
set VSC2HI = .5
set VSC2LO = .5
set VSC4HI = 0.0
set VSC4LO = 0.0
else
echo "$0 ERROR: Cannot deal with GRID = $OCN_GRID "
exit -1
Expand Down Expand Up @@ -689,6 +709,26 @@ else if ($OCN_GRID == tnx0.25v4) then
else
set NDEPFILE = "''"
endif
else if ($OCN_GRID == tnx0.125v4) then
set GRFILE = "'$DIN_LOC_ROOT/ocn/blom/grid/grid_tnx0.125v4_20200722.nc'"
set ICFILE = "'$DIN_LOC_ROOT/ocn/blom/inicon/inicon_tnx0.125v4_20200728.nc'"
set TDFILE = "'$DIN_LOC_ROOT/ocn/blom/bndcon/tidal_dissipation_tnx0.125v4_20200722.nc'"
set MER_ORFILE = "'$DIN_LOC_ROOT/ocn/blom/grid/ocean_regions_tnx0.125v4_20200722.nc'"
set MER_MIFILE = "'$DIN_LOC_ROOT/ocn/blom/grid/mertra_index_tnx0.125v4_20200722.dat'"
set SEC_SIFILE = "'$DIN_LOC_ROOT/ocn/blom/grid/section_index_tnx0.125v4_20200722.dat'"
set CCFILE = "'$DIN_LOC_ROOT/ocn/blom/bndcon/chlorophyll_concentration_tnx0.125v4_20200722.nc'"
set SCFILE = "'$DIN_LOC_ROOT/ocn/blom/bndcon/sss_clim_core_tnx0.125v4_20200722.nc'"
set FEDEPFILE = "'$DIN_LOC_ROOT/ocn/blom/bndcon/dustdep_mhw2006_tnx0.125v4_20200722.nc'"
if ($BLOM_RIVER_NUTRIENTS == TRUE) then
set RIVINFILE = "'$DIN_LOC_ROOT/ocn/blom/bndcon/river_nutrients_GNEWS2000_tnx0.125v4_20170821.nc'"
else
set RIVINFILE = "''"
endif
if ($BLOM_N_DEPOSITION == TRUE) then
set NDEPFILE = "'$DIN_LOC_ROOT/ocn/blom/bndcon/$NDEPFNAME'"
else
set NDEPFILE = "''"
endif
else
echo "$0 ERROR: Cannot deal with GRID = $OCN_GRID "
exit -1
Expand Down
38 changes: 38 additions & 0 deletions cime_config/config_pes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,44 @@
</mach>
</grid>

<grid name="a%T62.+oi%tnx0.125v4">
<mach name="any">
<pes pesize="any" compset="_DATM.*_BLOM">
<comment>none</comment>
<ntasks>
<ntasks_atm>128</ntasks_atm>
<ntasks_rof>128</ntasks_rof>
<ntasks_ice>1440</ntasks_ice>
<ntasks_ocn>1532</ntasks_ocn>
<ntasks_cpl>1440</ntasks_cpl>
<ntasks_lnd>128</ntasks_lnd>
<ntasks_glc>128</ntasks_glc>
<ntasks_wav>128</ntasks_wav>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>1440</rootpe_ocn>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_wav>0</rootpe_wav>
<rootpe_glc>0</rootpe_glc>
</rootpe>
</pes>
</mach>
</grid>

<grid name="a%TL319.+oi%tnx1v4">
<mach name="any">
<pes pesize="M" compset="any">
Expand Down

0 comments on commit 0c7f492

Please sign in to comment.