Commit 88bb6d4
committed
Let config_len_disp default to 0.0, in which case its value is set by nominalMinDc
With this commit, the config_len_disp namelist option defaults to 0.0 and is
hidden by default. Additionally, a new variable, nominalMinDc, is read from the
input file and read/written from/to restart files.
If a positive value for config_len_disp is supplied in the &nhyd_model namelist
group, then that value is used for the horizontal length scale in the model;
otherwise, if a positive value for the nominalMinDc variable is found in the
input file, that value is used.
If both config_len_disp and nominalMinDc values are positive real values, and if
they differ by very much (~1.0e-6 relative difference), then a warning is
printed to the log file, and the value specified in the namelist for
config_len_disp is used to set nominalMinDc.
If neither config_len_disp was specified in namelist.atmosphere file nor a valid
value for nominalMinDc was read from the input file, the atmosphere core
initialization will stop with an error:
ERROR: Both config_len_disp and nominalMinDc are <= 0.0.
ERROR: Please either specify config_len_disp in the &nhyd_model namelist group,
ERROR: or use an input file that provides a valid value for the nominalMinDc variable.1 parent fb00fe1 commit 88bb6d4
2 files changed
Lines changed: 60 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
142 | 142 | | |
143 | 143 | | |
144 | 144 | | |
145 | | - | |
| 145 | + | |
146 | 146 | | |
147 | 147 | | |
148 | | - | |
| 148 | + | |
149 | 149 | | |
150 | 150 | | |
151 | 151 | | |
| |||
457 | 457 | | |
458 | 458 | | |
459 | 459 | | |
| 460 | + | |
460 | 461 | | |
461 | 462 | | |
462 | 463 | | |
| |||
592 | 593 | | |
593 | 594 | | |
594 | 595 | | |
| 596 | + | |
595 | 597 | | |
596 | 598 | | |
597 | 599 | | |
| |||
1305 | 1307 | | |
1306 | 1308 | | |
1307 | 1309 | | |
| 1310 | + | |
| 1311 | + | |
| 1312 | + | |
1308 | 1313 | | |
1309 | 1314 | | |
1310 | 1315 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
74 | 77 | | |
75 | 78 | | |
76 | 79 | | |
| |||
149 | 152 | | |
150 | 153 | | |
151 | 154 | | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
152 | 205 | | |
153 | 206 | | |
154 | 207 | | |
| |||
0 commit comments