diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml index d7b496cd087..5b39250130c 100644 --- a/config/acme/allactive/config_pesall.xml +++ b/config/acme/allactive/config_pesall.xml @@ -3094,39 +3094,6 @@ 0 - - none - - 1024 - 1024 - 1024 - 1024 - 1024 - 1024 - 1024 - 1024 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - @@ -4671,10 +4638,10 @@ - + - - none + + ne30-wcycl case 1916 120 @@ -4706,39 +4673,6 @@ 0 - - none - - 8 - 8 - 8 - 8 - 8 - 8 - 8 - 8 - - - 16 - 16 - 16 - 16 - 16 - 16 - 16 - 16 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - @@ -6443,82 +6377,107 @@ - + - - none + + ne120 coupled-compset on 1024 nodes - 7200 - 256 - 256 - 6688 - 992 + 2700 + 300 + 300 + 2400 + 1396 1 1 - 7200 + 2400 - 16 - 16 - 1 - 1 - 1 + 8 + 8 + 8 + 8 + 2 1 1 - 1 + 8 0 - 0 - 256 - 512 - 7200 + 2400 + 2400 + 0 + 2700 0 0 0 - - - - - - none + + ne120 coupled-compset on 2048 nodes - 7200 - 256 - 256 - 6688 - 992 + 5400 + 2608 + 2608 + 2792 + 2792 1 1 - 7200 + 2792 - 16 - 16 - 1 - 1 - 1 + 8 + 8 + 8 + 8 + 2 1 1 - 1 + 8 0 - 0 - 256 - 512 - 7200 + 2792 + 2792 + 0 + 5400 + 0 + 0 + 0 + + + + ne120 coupled-compset on 4096 nodes + + 10800 + 2608 + 2608 + 8192 + 5584 + 1 + 1 + 8192 + + + 8 + 8 + 8 + 8 + 2 + 1 + 1 + 8 + + + 0 + 8192 + 8192 + 0 + 10800 0 0 0 - - - - ne120 F-compset on 512 nodes 64 @@ -6663,43 +6622,6 @@ - - - - T62_oQU120 grid for MPAS tests on 16 nodes pure-MPI - - 64 - 64 - 64 - 64 - 64 - 64 - 64 - 64 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - diff --git a/config/acme/machines/Depends.mira b/config/acme/machines/Depends.mira index 4a2f02b424b..6c341cfb76f 100644 --- a/config/acme/machines/Depends.mira +++ b/config/acme/machines/Depends.mira @@ -64,3 +64,8 @@ advance_xm_wpxp_module.o: advance_xm_wpxp_module.F90 advance_wp2_wp3_module.o: advance_wp2_wp3_module.F90 $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -Q! $< ### end + +# lower -O flag for ne120-coupled cases +ifneq (,$(and $(findstring a%ne120,$(shell $(CASEROOT)/xmlquery --value GRID --caseroot $(CASEROOT) )),$(findstring MPASO,$(shell $(CASEROOT)/xmlquery --value COMPSET --caseroot $(CASEROOT) )))) +FFLAGS:=$(subst O3,O2,$(FFLAGS)) +endif diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml index bbca4c0d331..70fc53a667f 100644 --- a/config/acme/machines/config_machines.xml +++ b/config/acme/machines/config_machines.xml @@ -1535,8 +1535,8 @@ /etc/profile.d/00softenv.csh - soft /etc/profile.d/00softenv.sh + soft soft +mpiwrapper-xl diff --git a/config/acme/machines/config_pio.xml b/config/acme/machines/config_pio.xml index f76c751661a..f01a3fd365e 100644 --- a/config/acme/machines/config_pio.xml +++ b/config/acme/machines/config_pio.xml @@ -23,6 +23,7 @@ $PES_PER_NODE 60 128 + -99 64 @@ -113,13 +114,11 @@ --> - - - - - - @@ -263,7 +253,6 @@ - - - - - + + + + + + 1 + + + +