[Ncep.list.nems.announce] nems r99852: Merge changes from git

[Samuel.Trahan at noaa.gov]

commit
 49c91b904ebe4501de62333...
Message-ID: <5a90bc23.TQNYx634BlWcm+zG%Samuel.Trahan at noaa.gov>
User-Agent: Heirloom mailx 12.5 7/5/10
MIME-Version: 1.0
Content-Type: multipart/mixed;
 boundary="=_5a90bc23.r5gPvSu0MR4hlgrf5fm3YNzh4YWLCuElTkFrqoONLoAgBBv7"

This is a multi-part message in MIME format.

--=_5a90bc23.r5gPvSu0MR4hlgrf5fm3YNzh4YWLCuElTkFrqoONLoAgBBv7
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Friendly NEMS developers,

This is an automated email about a NEMS commit.

Project: nems
URL: https://svnemc.ncep.noaa.gov/projects/nems/trunk
Revision: 99852
Author:   samuel.trahan at noaa.gov
Date:     2018-02-24T01:12:54.090338Z
Message:
Merge changes from git

commit 49c91b904ebe4501de623332a92c11fe2f9b5256
Author: Samuel Trahan <Samuel.Trahan at noaa.gov>
Date:   Fri Feb 23 19:34:14 2018 +0000

    Switch a "git remote show origin" to "git remote show -n origin" to avoid contacting server.

commit 53c62c82405bf62f612c0f5c4f6fa8a623f0b449
Author: jessica.meixner <Jessica.Meixner at noaa.gov>
Date:   Mon Feb 5 00:30:49 2018 +0000

    underscoreww3: adding support for cray for WW3

commit e7919e3df1080e3e98f808e36e766b7864b22024
Author: Samuel Trahan <Samuel.Trahan at noaa.gov>
Date:   Thu Feb 1 20:45:20 2018 +0000

    NEMSAppBuilder clobbers NEMS configuration files before running NEMS/src/configure

commit b48128a011b46613ae2010f1c1702dbde6291264
Author: wx20st <Samuel.Trahan at t10a1.ncep.noaa.gov>
Date:   Thu Feb 1 15:46:08 2018 +0000

    Switch wcoss.phase1 and wcoss.phase2 to wcoss_phase1 and wcoss_phase2


Differences:
Index: checkout/src/makefile
===================================================================
--- checkout/src/makefile	(revision 99545)
+++ checkout/src/makefile	(revision 99852)
@@ -377,7 +377,7 @@
 WHOAMI  := $(shell whoami)
 CMP_DATE := $(shell date)
 
-SVN_URL := $(shell git remote show origin | grep 'Fetch URL:' | sed 's,^[^:]*: ,,g' )
+SVN_URL := $(shell git remote show -n origin | grep 'Fetch URL:' | sed 's,^[^:]*: ,,g' )
 SVN_REV := $(shell git show HEAD | head -1 | cut -f 2 -d ' ' | cut -c1-12 )
 
 ifeq ($(SVN_URL),)
Index: checkout/NEMSAppBuilder
===================================================================
--- checkout/NEMSAppBuilder	(revision 99545)
+++ checkout/NEMSAppBuilder	(revision 99852)
@@ -60,10 +60,10 @@
 	MACHINE_ID=wcoss
         if ( ! cat /proc/cpuinfo |grep 'processor.*32' ) ; then
             # Fewer than 32 fake (hyperthreading) cpus, so Phase 1.
-            FULL_MACHINE_ID=wcoss.phase1
+            FULL_MACHINE_ID=wcoss_phase1
             PEX=1
         else
-            FULL_MACHINE_ID=wcoss.phase2
+            FULL_MACHINE_ID=wcoss_phase2
             PEX=2
         fi
     else
@@ -988,7 +988,11 @@
 
 build_ww3(){
   # in: COMP, COMP_SRCDIR, COMP_BINDIR
-    local WW3_COMP='Intel'
+  #  local WW3_COMP='Intel'
+  local WW3_COMP=$FULL_MACHINE_ID
+  if ([ ! -f "$COMP_SRCDIR/bin/comp.$WW3_COMP" ]); then
+     local WW3_COMP='Intel'
+  fi 
   if [[ "$1" == "clean" ]] ; then
     echo "Cleaning $COMP..."
     cd "$COMP_SRCDIR/esmf"
@@ -1320,6 +1324,9 @@
     conf_mode="appbuilder-specified"
 fi
 
+autonote "Clobber configuration files."
+rm -f ESMFVersionDefine.h conf/modules.nems* externals.nems
+
 autonote "Configure using $conf_mode mode."
 autonote "Command: ./configure $CONFOPT $CHOSEN_MODULE"
 ./configure "$CONFOPT" $CHOSEN_MODULE \

--=_5a90bc23.r5gPvSu0MR4hlgrf5fm3YNzh4YWLCuElTkFrqoONLoAgBBv7
Content-Type: text/plain;
 charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="99852.diff"

Index: checkout/src/makefile
===================================================================
--- checkout/src/makefile	(revision 99545)
+++ checkout/src/makefile	(revision 99852)
@@ -377,7 +377,7 @@
 WHOAMI  := $(shell whoami)
 CMP_DATE := $(shell date)
 
-SVN_URL := $(shell git remote show origin | grep 'Fetch URL:' | sed 's,^[^:]*: ,,g' )
+SVN_URL := $(shell git remote show -n origin | grep 'Fetch URL:' | sed 's,^[^:]*: ,,g' )
 SVN_REV := $(shell git show HEAD | head -1 | cut -f 2 -d ' ' | cut -c1-12 )
 
 ifeq ($(SVN_URL),)
Index: checkout/NEMSAppBuilder
===================================================================
--- checkout/NEMSAppBuilder	(revision 99545)
+++ checkout/NEMSAppBuilder	(revision 99852)
@@ -60,10 +60,10 @@
 	MACHINE_ID=wcoss
         if ( ! cat /proc/cpuinfo |grep 'processor.*32' ) ; then
             # Fewer than 32 fake (hyperthreading) cpus, so Phase 1.
-            FULL_MACHINE_ID=wcoss.phase1
+            FULL_MACHINE_ID=wcoss_phase1
             PEX=1
         else
-            FULL_MACHINE_ID=wcoss.phase2
+            FULL_MACHINE_ID=wcoss_phase2
             PEX=2
         fi
     else
@@ -988,7 +988,11 @@
 
 build_ww3(){
   # in: COMP, COMP_SRCDIR, COMP_BINDIR
-    local WW3_COMP='Intel'
+  #  local WW3_COMP='Intel'
+  local WW3_COMP=$FULL_MACHINE_ID
+  if ([ ! -f "$COMP_SRCDIR/bin/comp.$WW3_COMP" ]); then
+     local WW3_COMP='Intel'
+  fi 
   if [[ "$1" == "clean" ]] ; then
     echo "Cleaning $COMP..."
     cd "$COMP_SRCDIR/esmf"
@@ -1320,6 +1324,9 @@
     conf_mode="appbuilder-specified"
 fi
 
+autonote "Clobber configuration files."
+rm -f ESMFVersionDefine.h conf/modules.nems* externals.nems
+
 autonote "Configure using $conf_mode mode."
 autonote "Command: ./configure $CONFOPT $CHOSEN_MODULE"
 ./configure "$CONFOPT" $CHOSEN_MODULE \

--=_5a90bc23.r5gPvSu0MR4hlgrf5fm3YNzh4YWLCuElTkFrqoONLoAgBBv7--