From 66e6fecfffeb48c6d703443f5ea33d77f0cf0769 Mon Sep 17 00:00:00 2001 From: Balwinder Date: Wed, 12 Apr 2017 16:51:16 -0400 Subject: [PATCH 1/2] Adds test mods directory for running cosp lite configuration This PR adds a test mods directory so that any test/compset can be run with cosp lite without having to create a new compset. [BFB] - Bit-For-Bit --- .../acme/testmods_dirs/allactive/cam/cosplite/user_nl_cam | 1 + .../testmods_dirs/allactive/cam/cosplite/xmlchange_cmnds | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/user_nl_cam create mode 100644 cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/xmlchange_cmnds diff --git a/cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/user_nl_cam b/cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/user_nl_cam new file mode 100644 index 000000000000..4cc984323767 --- /dev/null +++ b/cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/user_nl_cam @@ -0,0 +1 @@ +cosp_lite = .true. \ No newline at end of file diff --git a/cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/xmlchange_cmnds b/cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/xmlchange_cmnds new file mode 100644 index 000000000000..739f042f965a --- /dev/null +++ b/cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/xmlchange_cmnds @@ -0,0 +1,5 @@ +if [ `./xmlquery MACH -value` = "melvin" ]; then + ./xmlchange PIO_TYPENAME=netcdf +fi + +./xmlchange --append CAM_CONFIG_OPTS='-cosp' From af7d347f213d0fd5b4424ccdf42fe27c87cd1f54 Mon Sep 17 00:00:00 2001 From: Balwinder Date: Thu, 13 Apr 2017 12:47:12 -0400 Subject: [PATCH 2/2] Removes melvin if block from cam test mods, adds melvin to config_pio This commit removes melvin if block from both outfrq9s and cosplite test mods which forces melvin to use netcdf instead of pnetcdf. Melvin is now added to config_pio.xml so that it always uses netcdf. [BFB] - Bit-For-Bit --- cime/cime_config/acme/machines/config_pio.xml | 1 + .../acme/testmods_dirs/allactive/cam/cosplite/xmlchange_cmnds | 4 ---- .../acme/testmods_dirs/allactive/cam/outfrq9s/xmlchange_cmnds | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/cime/cime_config/acme/machines/config_pio.xml b/cime/cime_config/acme/machines/config_pio.xml index e1716e68c5b5..b7caef03cad4 100644 --- a/cime/cime_config/acme/machines/config_pio.xml +++ b/cime/cime_config/acme/machines/config_pio.xml @@ -46,6 +46,7 @@ pnetcdf netcdf + netcdf netcdf netcdf netcdf diff --git a/cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/xmlchange_cmnds b/cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/xmlchange_cmnds index 739f042f965a..87e28ea8cf51 100644 --- a/cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/xmlchange_cmnds +++ b/cime/cime_config/acme/testmods_dirs/allactive/cam/cosplite/xmlchange_cmnds @@ -1,5 +1 @@ -if [ `./xmlquery MACH -value` = "melvin" ]; then - ./xmlchange PIO_TYPENAME=netcdf -fi - ./xmlchange --append CAM_CONFIG_OPTS='-cosp' diff --git a/cime/cime_config/acme/testmods_dirs/allactive/cam/outfrq9s/xmlchange_cmnds b/cime/cime_config/acme/testmods_dirs/allactive/cam/outfrq9s/xmlchange_cmnds index ac78d092c67a..0d976d6f0d0e 100644 --- a/cime/cime_config/acme/testmods_dirs/allactive/cam/outfrq9s/xmlchange_cmnds +++ b/cime/cime_config/acme/testmods_dirs/allactive/cam/outfrq9s/xmlchange_cmnds @@ -1,5 +1 @@ -if [ `./xmlquery MACH -value` = "melvin" ]; then - ./xmlchange PIO_TYPENAME=netcdf -fi - ./xmlchange ROF_NCPL=48