Skip to content

Commit a7e1611

Browse files
alperaltuntasalperaltuntas
authored
config_pes.xml updates (#215)
* config_pes.xml updates: remove unnecessary blocks: no need to distinguish T62 and TL319 increase NTASKS_OCN for cases with WW3. ' * Miscellaneous runtime parameter changes: - Introduce MOM6_WW3_CPL_METHOD xml variable controlling which wave coupling method gets used: most, legacy, or none - For B cases, set MIN_SALINITY to 1.0e-6 - For t232, set Laplacian to False - For t232, remove MEKE_ALPHA_RHINES, MEKE_ALPHA_DEFORM, MEKE_ALPHA_FRICT, MEKE_ALPHA_GRID, MEKE_CT * set NTASKS_OCN to 896
1 parent 9d0d916 commit a7e1611

3 files changed

Lines changed: 13 additions & 283 deletions

File tree

‎cime_config/config_pes.xml‎

Lines changed: 6 additions & 281 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</mach>
4242
</grid>
4343

44-
<grid name="a%T62.+oi%(tx0.66v1|tx2_3v2)">
44+
<grid name="a%(TL319|T62).+oi%tx2_3v2">
4545
<mach name="any">
4646
<pes pesize="any" compset="any">
4747
<comment>none</comment>
@@ -184,7 +184,7 @@
184184
<ntasks_rof>128</ntasks_rof>
185185
<ntasks_cpl>128</ntasks_cpl>
186186
<ntasks_ice>128</ntasks_ice>
187-
<ntasks_ocn>384</ntasks_ocn>
187+
<ntasks_ocn>896</ntasks_ocn>
188188
<ntasks_lnd>1</ntasks_lnd>
189189
<ntasks_wav>256</ntasks_wav>
190190
<ntasks_glc>1</ntasks_glc>
@@ -204,9 +204,9 @@
204204
<rootpe_rof>0</rootpe_rof>
205205
<rootpe_cpl>0</rootpe_cpl>
206206
<rootpe_ice>0</rootpe_ice>
207-
<rootpe_ocn>256</rootpe_ocn>
207+
<rootpe_ocn>384</rootpe_ocn>
208208
<rootpe_lnd>0</rootpe_lnd>
209-
<rootpe_wav>0</rootpe_wav>
209+
<rootpe_wav>128</rootpe_wav>
210210
<rootpe_glc>0</rootpe_glc>
211211
</rootpe>
212212
</pes>
@@ -380,245 +380,7 @@
380380
</mach>
381381
</grid>
382382

383-
<grid name="a%TL319.+oi%(tx0.66v1|tx2_3v2)">
384-
<mach name="any">
385-
<pes pesize="any" compset="_DATM.+_DICE.+_SWAV">
386-
<comment>none</comment>
387-
<ntasks>
388-
<ntasks_atm>48</ntasks_atm>
389-
<ntasks_rof>48</ntasks_rof>
390-
<ntasks_cpl>48</ntasks_cpl>
391-
<ntasks_ice>48</ntasks_ice>
392-
<ntasks_ocn>144</ntasks_ocn>
393-
<ntasks_lnd>1</ntasks_lnd>
394-
<ntasks_wav>1</ntasks_wav>
395-
<ntasks_glc>1</ntasks_glc>
396-
</ntasks>
397-
<nthrds>
398-
<nthrds_atm>1</nthrds_atm>
399-
<nthrds_lnd>1</nthrds_lnd>
400-
<nthrds_rof>1</nthrds_rof>
401-
<nthrds_ice>1</nthrds_ice>
402-
<nthrds_ocn>1</nthrds_ocn>
403-
<nthrds_glc>1</nthrds_glc>
404-
<nthrds_wav>1</nthrds_wav>
405-
<nthrds_cpl>1</nthrds_cpl>
406-
</nthrds>
407-
<rootpe>
408-
<rootpe_atm>0</rootpe_atm>
409-
<rootpe_rof>0</rootpe_rof>
410-
<rootpe_cpl>0</rootpe_cpl>
411-
<rootpe_ice>0</rootpe_ice>
412-
<rootpe_ocn>48</rootpe_ocn>
413-
<rootpe_lnd>0</rootpe_lnd>
414-
<rootpe_wav>0</rootpe_wav>
415-
<rootpe_glc>0</rootpe_glc>
416-
</rootpe>
417-
</pes>
418-
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6(?!.*%MARBL-BIO).+_SWAV">
419-
<comment>none</comment>
420-
<ntasks>
421-
<ntasks_atm>96</ntasks_atm>
422-
<ntasks_rof>96</ntasks_rof>
423-
<ntasks_cpl>96</ntasks_cpl>
424-
<ntasks_ice>96</ntasks_ice>
425-
<ntasks_ocn>144</ntasks_ocn>
426-
<ntasks_lnd>1</ntasks_lnd>
427-
<ntasks_wav>1</ntasks_wav>
428-
<ntasks_glc>1</ntasks_glc>
429-
</ntasks>
430-
<nthrds>
431-
<nthrds_atm>1</nthrds_atm>
432-
<nthrds_lnd>1</nthrds_lnd>
433-
<nthrds_rof>1</nthrds_rof>
434-
<nthrds_ice>1</nthrds_ice>
435-
<nthrds_ocn>1</nthrds_ocn>
436-
<nthrds_glc>1</nthrds_glc>
437-
<nthrds_wav>1</nthrds_wav>
438-
<nthrds_cpl>1</nthrds_cpl>
439-
</nthrds>
440-
<rootpe>
441-
<rootpe_atm>0</rootpe_atm>
442-
<rootpe_rof>0</rootpe_rof>
443-
<rootpe_cpl>0</rootpe_cpl>
444-
<rootpe_ice>0</rootpe_ice>
445-
<rootpe_ocn>96</rootpe_ocn>
446-
<rootpe_lnd>0</rootpe_lnd>
447-
<rootpe_wav>0</rootpe_wav>
448-
<rootpe_glc>0</rootpe_glc>
449-
</rootpe>
450-
</pes>
451-
</mach>
452-
<mach name="derecho">
453-
<pes pesize="any" compset="_DATM.+_DICE.*_MOM6(?!.*%MARBL-BIO).+_SWAV">
454-
<comment>none</comment>
455-
<ntasks>
456-
<ntasks_atm>128</ntasks_atm>
457-
<ntasks_rof>128</ntasks_rof>
458-
<ntasks_cpl>128</ntasks_cpl>
459-
<ntasks_ice>128</ntasks_ice>
460-
<ntasks_ocn>896</ntasks_ocn>
461-
<ntasks_lnd>1</ntasks_lnd>
462-
<ntasks_wav>1</ntasks_wav>
463-
<ntasks_glc>1</ntasks_glc>
464-
</ntasks>
465-
<nthrds>
466-
<nthrds_atm>1</nthrds_atm>
467-
<nthrds_lnd>1</nthrds_lnd>
468-
<nthrds_rof>1</nthrds_rof>
469-
<nthrds_ice>1</nthrds_ice>
470-
<nthrds_ocn>1</nthrds_ocn>
471-
<nthrds_glc>1</nthrds_glc>
472-
<nthrds_wav>1</nthrds_wav>
473-
<nthrds_cpl>1</nthrds_cpl>
474-
</nthrds>
475-
<rootpe>
476-
<rootpe_atm>0</rootpe_atm>
477-
<rootpe_rof>0</rootpe_rof>
478-
<rootpe_cpl>0</rootpe_cpl>
479-
<rootpe_ice>0</rootpe_ice>
480-
<rootpe_ocn>128</rootpe_ocn>
481-
<rootpe_lnd>0</rootpe_lnd>
482-
<rootpe_wav>0</rootpe_wav>
483-
<rootpe_glc>0</rootpe_glc>
484-
</rootpe>
485-
</pes>
486-
<pes pesize="any" compset="_DATM.+_DICE.*_MOM6%[^_]*MARBL-BIO.+_SWAV">
487-
<comment>none</comment>
488-
<ntasks>
489-
<ntasks_atm>128</ntasks_atm>
490-
<ntasks_rof>128</ntasks_rof>
491-
<ntasks_cpl>128</ntasks_cpl>
492-
<ntasks_ice>128</ntasks_ice>
493-
<ntasks_ocn>2560</ntasks_ocn>
494-
<ntasks_lnd>1</ntasks_lnd>
495-
<ntasks_wav>1</ntasks_wav>
496-
<ntasks_glc>1</ntasks_glc>
497-
</ntasks>
498-
<nthrds>
499-
<nthrds_atm>1</nthrds_atm>
500-
<nthrds_lnd>1</nthrds_lnd>
501-
<nthrds_rof>1</nthrds_rof>
502-
<nthrds_ice>1</nthrds_ice>
503-
<nthrds_ocn>1</nthrds_ocn>
504-
<nthrds_glc>1</nthrds_glc>
505-
<nthrds_wav>1</nthrds_wav>
506-
<nthrds_cpl>1</nthrds_cpl>
507-
</nthrds>
508-
<rootpe>
509-
<rootpe_atm>0</rootpe_atm>
510-
<rootpe_rof>0</rootpe_rof>
511-
<rootpe_cpl>0</rootpe_cpl>
512-
<rootpe_ice>0</rootpe_ice>
513-
<rootpe_ocn>128</rootpe_ocn>
514-
<rootpe_lnd>0</rootpe_lnd>
515-
<rootpe_wav>0</rootpe_wav>
516-
<rootpe_glc>0</rootpe_glc>
517-
</rootpe>
518-
</pes>
519-
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6(?!.*%MARBL-BIO).+_SWAV">
520-
<comment>none</comment>
521-
<ntasks>
522-
<ntasks_atm>128</ntasks_atm>
523-
<ntasks_rof>128</ntasks_rof>
524-
<ntasks_cpl>128</ntasks_cpl>
525-
<ntasks_ice>128</ntasks_ice>
526-
<ntasks_ocn>896</ntasks_ocn>
527-
<ntasks_lnd>1</ntasks_lnd>
528-
<ntasks_wav>1</ntasks_wav>
529-
<ntasks_glc>1</ntasks_glc>
530-
</ntasks>
531-
<nthrds>
532-
<nthrds_atm>1</nthrds_atm>
533-
<nthrds_lnd>1</nthrds_lnd>
534-
<nthrds_rof>1</nthrds_rof>
535-
<nthrds_ice>1</nthrds_ice>
536-
<nthrds_ocn>1</nthrds_ocn>
537-
<nthrds_glc>1</nthrds_glc>
538-
<nthrds_wav>1</nthrds_wav>
539-
<nthrds_cpl>1</nthrds_cpl>
540-
</nthrds>
541-
<rootpe>
542-
<rootpe_atm>0</rootpe_atm>
543-
<rootpe_rof>0</rootpe_rof>
544-
<rootpe_cpl>0</rootpe_cpl>
545-
<rootpe_ice>0</rootpe_ice>
546-
<rootpe_ocn>128</rootpe_ocn>
547-
<rootpe_lnd>0</rootpe_lnd>
548-
<rootpe_wav>0</rootpe_wav>
549-
<rootpe_glc>0</rootpe_glc>
550-
</rootpe>
551-
</pes>
552-
<pes pesize="any" compset="_DATM.+_CICE.*_MOM6%[^_]*MARBL-BIO.+_SWAV">
553-
<comment>none</comment>
554-
<ntasks>
555-
<ntasks_atm>128</ntasks_atm>
556-
<ntasks_rof>128</ntasks_rof>
557-
<ntasks_cpl>128</ntasks_cpl>
558-
<ntasks_ice>128</ntasks_ice>
559-
<ntasks_ocn>2560</ntasks_ocn>
560-
<ntasks_lnd>1</ntasks_lnd>
561-
<ntasks_wav>1</ntasks_wav>
562-
<ntasks_glc>1</ntasks_glc>
563-
</ntasks>
564-
<nthrds>
565-
<nthrds_atm>1</nthrds_atm>
566-
<nthrds_lnd>1</nthrds_lnd>
567-
<nthrds_rof>1</nthrds_rof>
568-
<nthrds_ice>1</nthrds_ice>
569-
<nthrds_ocn>1</nthrds_ocn>
570-
<nthrds_glc>1</nthrds_glc>
571-
<nthrds_wav>1</nthrds_wav>
572-
<nthrds_cpl>1</nthrds_cpl>
573-
</nthrds>
574-
<rootpe>
575-
<rootpe_atm>0</rootpe_atm>
576-
<rootpe_rof>0</rootpe_rof>
577-
<rootpe_cpl>0</rootpe_cpl>
578-
<rootpe_ice>0</rootpe_ice>
579-
<rootpe_ocn>128</rootpe_ocn>
580-
<rootpe_lnd>0</rootpe_lnd>
581-
<rootpe_wav>0</rootpe_wav>
582-
<rootpe_glc>0</rootpe_glc>
583-
</rootpe>
584-
</pes>
585-
<pes pesize="any" compset="DATM.+CICE.+WW3">
586-
<comment>none</comment>
587-
<ntasks>
588-
<ntasks_atm>128</ntasks_atm>
589-
<ntasks_rof>128</ntasks_rof>
590-
<ntasks_cpl>128</ntasks_cpl>
591-
<ntasks_ice>128</ntasks_ice>
592-
<ntasks_ocn>384</ntasks_ocn>
593-
<ntasks_lnd>1</ntasks_lnd>
594-
<ntasks_wav>256</ntasks_wav>
595-
<ntasks_glc>1</ntasks_glc>
596-
</ntasks>
597-
<nthrds>
598-
<nthrds_atm>1</nthrds_atm>
599-
<nthrds_lnd>1</nthrds_lnd>
600-
<nthrds_rof>1</nthrds_rof>
601-
<nthrds_ice>1</nthrds_ice>
602-
<nthrds_ocn>1</nthrds_ocn>
603-
<nthrds_glc>1</nthrds_glc>
604-
<nthrds_wav>1</nthrds_wav>
605-
<nthrds_cpl>1</nthrds_cpl>
606-
</nthrds>
607-
<rootpe>
608-
<rootpe_atm>0</rootpe_atm>
609-
<rootpe_rof>0</rootpe_rof>
610-
<rootpe_cpl>0</rootpe_cpl>
611-
<rootpe_ice>0</rootpe_ice>
612-
<rootpe_ocn>256</rootpe_ocn>
613-
<rootpe_lnd>0</rootpe_lnd>
614-
<rootpe_wav>0</rootpe_wav>
615-
<rootpe_glc>0</rootpe_glc>
616-
</rootpe>
617-
</pes>
618-
</mach>
619-
</grid>
620-
621-
<grid name="a%T62.+oi%tx0.25v1">
383+
<grid name="a%(TL319|T62).+oi%tx0.25v1">
622384
<mach name="derecho">
623385
<pes pesize="any" compset="any">
624386
<comment>none</comment>
@@ -660,7 +422,7 @@
660422
<ntasks_rof>128</ntasks_rof>
661423
<ntasks_cpl>128</ntasks_cpl>
662424
<ntasks_ice>256</ntasks_ice>
663-
<ntasks_ocn>512</ntasks_ocn>
425+
<ntasks_ocn>896</ntasks_ocn>
664426
<ntasks_lnd>1</ntasks_lnd>
665427
<ntasks_wav>1</ntasks_wav>
666428
<ntasks_glc>1</ntasks_glc>
@@ -689,41 +451,4 @@
689451
</mach>
690452
</grid>
691453

692-
<grid name="oi%tx0.66v1.+w%wtx0.66v1">
693-
<mach name="derecho">
694-
<pes pesize="any" compset="any">
695-
<comment>none</comment>
696-
<ntasks>
697-
<ntasks_atm>128</ntasks_atm>
698-
<ntasks_rof>128</ntasks_rof>
699-
<ntasks_cpl>128</ntasks_cpl>
700-
<ntasks_ice>128</ntasks_ice>
701-
<ntasks_ocn>512</ntasks_ocn>
702-
<ntasks_lnd>1</ntasks_lnd>
703-
<ntasks_wav>128</ntasks_wav>
704-
<ntasks_glc>1</ntasks_glc>
705-
</ntasks>
706-
<nthrds>
707-
<nthrds_atm>1</nthrds_atm>
708-
<nthrds_lnd>1</nthrds_lnd>
709-
<nthrds_rof>1</nthrds_rof>
710-
<nthrds_ice>1</nthrds_ice>
711-
<nthrds_ocn>1</nthrds_ocn>
712-
<nthrds_glc>1</nthrds_glc>
713-
<nthrds_wav>1</nthrds_wav>
714-
<nthrds_cpl>1</nthrds_cpl>
715-
</nthrds>
716-
<rootpe>
717-
<rootpe_atm>0</rootpe_atm>
718-
<rootpe_rof>0</rootpe_rof>
719-
<rootpe_cpl>0</rootpe_cpl>
720-
<rootpe_ice>0</rootpe_ice>
721-
<rootpe_ocn>256</rootpe_ocn>
722-
<rootpe_lnd>0</rootpe_lnd>
723-
<rootpe_wav>128</rootpe_wav>
724-
<rootpe_glc>0</rootpe_glc>
725-
</rootpe>
726-
</pes>
727-
</mach>
728-
</grid>
729454
</config_pes>

‎param_templates/MOM_input.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,9 @@ Global:
990990
If true, use a Laplacian horizontal viscosity."
991991
datatype: logical
992992
units: Boolean
993-
value: True
993+
value:
994+
$OCN_GRID == "tx2_3v2": False
995+
else: True
994996
KH:
995997
description: |
996998
"[m2 s-1] default = 0.0

‎param_templates/json/MOM_input.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,10 @@
747747
"description": "\"[Boolean] default = False\nIf true, use a Laplacian horizontal viscosity.\"\n",
748748
"datatype": "logical",
749749
"units": "Boolean",
750-
"value": true
750+
"value": {
751+
"$OCN_GRID == \"tx2_3v2\"": false,
752+
"else": true
753+
}
751754
},
752755
"KH": {
753756
"description": "\"[m2 s-1] default = 0.0\nThe background Laplacian horizontal viscosity.\"\n",

0 commit comments

Comments
 (0)