[Ncep.list.nems.announce] nems r99527: Merging commit from git master:
Samuel.Trahan at noaa.gov
Samuel.Trahan at noaa.gov
Wed Jan 10 21:13:05 UTC 2018
commit
53cdacac2785d4...
Message-ID: <5a5681e1.xi8A6ZxqOt4SZ2Ai%Samuel.Trahan at noaa.gov>
User-Agent: Heirloom mailx 12.5 7/5/10
MIME-Version: 1.0
Content-Type: multipart/mixed;
boundary="=_5a5681e1.HpmjfLYB/lN1wTrEZEd3f5umDP0zmXFLmMfpd8kGGXKVZm41"
This is a multi-part message in MIME format.
--=_5a5681e1.HpmjfLYB/lN1wTrEZEd3f5umDP0zmXFLmMfpd8kGGXKVZm41
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: 99527
Author: samuel.trahan at noaa.gov
Date: 2018-01-10T21:06:49.791062Z
Message:
Merging commit from git master:
commit 53cdacac2785d46bc675c10a4ae5d9f73ddcc755
Author: samuel.trahan <Samuel.Trahan at noaa.gov>
Date: Wed Jan 10 20:56:44 2018 +0000
Several bug fixes (details below):
1. Add some variables for WW3 to the nuopc dictionary
2. Set up module command at top of rtrun in NEMSCompsetRun to
work around issues with [t]csh in WCOSS
3. Allow multiplpe platform==(whatever) entries in compset
definitions
4. Point to /lfs3 instead of /pan2 for the hwrf software used
in NEMSCompsetRun on jet. (/pan2 was decommissioned)
5. Disable "svn info" code in NEMSCompsetRun when run within
a git clone.
Squashed commit of the following:
commit 6863fa3235be4eb59fc8982de2bb3d875b5a9789
Author: samuel.trahan <Samuel.Trahan at noaa.gov>
Date: Wed Jan 10 16:48:54 2018 +0000
On Luna and Surge, silence the output of "module purge" so that the spurious error message about an undefined MODULEHOME will not be printed.
commit 33041559c43fdb43e3c257e9eff898a45854a3d2
Author: Jessica.Meixner <Jessica.Meixner at noaa.gov>
Date: Tue Jan 2 16:55:39 2018 +0000
Adding variables for WW3 into nuopc dictionary
commit 8dc6a7e078f78616e311da1ad0f42ac612995f27
Author: Samuel Trahan <Samuel.Trahan at noaa.gov>
Date: Fri Dec 29 20:47:38 2017 +0000
NEMSCompsetRun rtreport: do not run "svn info" unless .svn directory exists
commit 06b7970d5cfe6e9cf5dfaa23972590f49e95dd70
Author: Samuel Trahan <Samuel.Trahan at noaa.gov>
Date: Fri Dec 29 20:47:04 2017 +0000
In logic to find module-setup.sh.inc, add another .. to path
commit 4ad72f5121f3e1a123e8578036bb34f9ce5407d8
Author: Samuel Trahan <Samuel.Trahan at noaa.gov>
Date: Fri Dec 29 20:37:22 2017 +0000
Add a missing end-of-line to a string
commit d22b4d91d35c877777bca43eecea8c7e2543f216
Author: Samuel Trahan <Samuel.Trahan at noaa.gov>
Date: Fri Dec 29 19:15:15 2017 +0000
Bug fix: source module-setup.sh.inc at top of rtrun. Needed as a workaround for issues with [t]csh on WCOSS.
commit 2a4e0a3b379646ee05441e0de55ae2f7520c541b
Author: Samuel Trahan <Samuel.Trahan at noaa.gov>
Date: Tue Dec 19 20:11:03 2017 +0000
allow multiple platform==(whatever) entries in set definitions
commit f4cd2a83383eb82a14631a5be2e4a3a0d8e87a31
Author: Samuel Trahan <Samuel.Trahan at noaa.gov>
Date: Tue Dec 19 20:10:29 2017 +0000
point to new area for emc-utils on jet
See attached file for full differences.
First 4000 bytes of differences:
Index: checkout/tests/rtgen
===================================================================
--- checkout/tests/rtgen (revision 99229)
+++ checkout/tests/rtgen (revision 99527)
@@ -93,9 +93,6 @@
last_lostdead=-999
while [[ 1 == 1 ]] ; do
log "check dependencies and submit jobs..."
- # The "grep -v" is to ignore a warning about /gpfs/hps/ptmp being
- # world-writable. The user can do nothing to fix the problem,
- # so there is no reason to warn about it.
rocotorun -w workflow.xml -d workflow.db
verbose "check status..."
cycledone=$( sqlite3 workflow.db 'SELECT id FROM cycles WHERE done>0' | wc -l )
@@ -812,6 +809,12 @@
here=produtil.cluster.where()
out.write('#!/usr/bin/env bash\n\n')
out.write('UNIQUE_ID=%d\n'%(self.unique_id,))
+ out.write('source '+bashify_string(os.path.abspath(os.path.join(
+ os.path.dirname(os.path.realpath(__file__)),
+ "../src/conf/module-setup.sh.inc"))))
+ if here.name in [ 'surge', 'luna' ]:
+ out.write(' > /dev/null 2>&1')
+ out.write('\n')
if here.name in [ 'tide', 'gyre' ]:
out.write('module load lsf\n')
out.write('module use /hwrf/noscrub/soft/modulefiles\n')
@@ -826,7 +829,7 @@
out.write('module load emc-utils ; have_qoutql=YES\n')
elif 'jet' in here.name:
out.write('module load hpss rocoto\n')
- out.write('module use /pan2/projects/hwrf-vd/soft/modulefiles\n')
+ out.write('module use /lfs3/projects/hwrf-vd/soft/modulefiles\n')
out.write('module load emc-utils\n')
out.write('have_qoutql=YES\n')
elif here.name == 'theia':
Index: checkout/tests/rtreportimpl
===================================================================
--- checkout/tests/rtreportimpl (revision 99229)
+++ checkout/tests/rtreportimpl (revision 99527)
@@ -60,24 +60,25 @@
checkout_top=os.path.dirname(os.path.dirname(os.path.dirname(
os.path.realpath(__file__))))
-rtreport( 'Repository information:')
-rtreport()
-rtreport()
-rtreport( 'REPO TOP:')
-svn=alias(exe('svn'))
-info=alias(svn['info'])
-try:
- with produtil.cd.NamedDir(checkout_top):
- rtreport(runstr(info['.']))
- status=runstr(svn['status',checkout_top])
- for line in status.splitlines():
- m=re.match('X\s+(.*)',line)
- if not m:
- continue
- rtreport('EXTERNAL %s:'%(m.group(1),))
- rtreport(runstr(info[os.path.join(checkout_top,m.group(1))]))
-except(ValueError,KeyError,ExitStatusException,EnvironmentError) as e:
- print 'WARNING: Could not complete subversion checks: '+str(e)
+if os.path.exists(".svn"):
+ rtreport( 'Repository information:')
+ rtreport()
+ rtreport()
+ rtreport( 'REPO TOP:')
+ svn=alias(exe('svn'))
+ info=alias(svn['info'])
+ try:
+ with produtil.cd.NamedDir(checkout_top):
+ rtreport(runstr(info['.']))
+ status=runstr(svn['status',checkout_top])
+ for line in status.splitlines():
+ m=re.match('X\s+(.*)',line)
+ if not m:
+ continue
+ rtreport('EXTERNAL %s:'%(m.group(1),))
+ rtreport(runstr(info[os.path.join(checkout_top,m.group(1))]))
+ except(ValueError,KeyError,ExitStatusException,EnvironmentError) as e:
+ print 'WARNING: Could not complete subversion checks: '+str(e)
itest=0
success=True
Index: checkout/tests
===================================================================
--- checkout/tests (revision 99229)
+++ checkout/tests (revision 99527)
Property changes on: checkout/tests
___________________________________________________________________
Modified: svn:externals
## -1 +1 ##
-produtil -r98242 https://svnemc.ncep.noaa.gov/projects/nceplibs/produtil/branches/regtests-run
+produtil -r99526 https://svnemc.ncep.noaa.gov/projects/nceplib
... see attachment for the rest ...
--=_5a5681e1.HpmjfLYB/lN1wTrEZEd3f5umDP0zmXFLmMfpd8kGGXKVZm41
Content-Type: text/plain;
charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="99527.diff"
Index: checkout/tests/rtgen
===================================================================
--- checkout/tests/rtgen (revision 99229)
+++ checkout/tests/rtgen (revision 99527)
@@ -93,9 +93,6 @@
last_lostdead=-999
while [[ 1 == 1 ]] ; do
log "check dependencies and submit jobs..."
- # The "grep -v" is to ignore a warning about /gpfs/hps/ptmp being
- # world-writable. The user can do nothing to fix the problem,
- # so there is no reason to warn about it.
rocotorun -w workflow.xml -d workflow.db
verbose "check status..."
cycledone=$( sqlite3 workflow.db 'SELECT id FROM cycles WHERE done>0' | wc -l )
@@ -812,6 +809,12 @@
here=produtil.cluster.where()
out.write('#!/usr/bin/env bash\n\n')
out.write('UNIQUE_ID=%d\n'%(self.unique_id,))
+ out.write('source '+bashify_string(os.path.abspath(os.path.join(
+ os.path.dirname(os.path.realpath(__file__)),
+ "../src/conf/module-setup.sh.inc"))))
+ if here.name in [ 'surge', 'luna' ]:
+ out.write(' > /dev/null 2>&1')
+ out.write('\n')
if here.name in [ 'tide', 'gyre' ]:
out.write('module load lsf\n')
out.write('module use /hwrf/noscrub/soft/modulefiles\n')
@@ -826,7 +829,7 @@
out.write('module load emc-utils ; have_qoutql=YES\n')
elif 'jet' in here.name:
out.write('module load hpss rocoto\n')
- out.write('module use /pan2/projects/hwrf-vd/soft/modulefiles\n')
+ out.write('module use /lfs3/projects/hwrf-vd/soft/modulefiles\n')
out.write('module load emc-utils\n')
out.write('have_qoutql=YES\n')
elif here.name == 'theia':
Index: checkout/tests/rtreportimpl
===================================================================
--- checkout/tests/rtreportimpl (revision 99229)
+++ checkout/tests/rtreportimpl (revision 99527)
@@ -60,24 +60,25 @@
checkout_top=os.path.dirname(os.path.dirname(os.path.dirname(
os.path.realpath(__file__))))
-rtreport( 'Repository information:')
-rtreport()
-rtreport()
-rtreport( 'REPO TOP:')
-svn=alias(exe('svn'))
-info=alias(svn['info'])
-try:
- with produtil.cd.NamedDir(checkout_top):
- rtreport(runstr(info['.']))
- status=runstr(svn['status',checkout_top])
- for line in status.splitlines():
- m=re.match('X\s+(.*)',line)
- if not m:
- continue
- rtreport('EXTERNAL %s:'%(m.group(1),))
- rtreport(runstr(info[os.path.join(checkout_top,m.group(1))]))
-except(ValueError,KeyError,ExitStatusException,EnvironmentError) as e:
- print 'WARNING: Could not complete subversion checks: '+str(e)
+if os.path.exists(".svn"):
+ rtreport( 'Repository information:')
+ rtreport()
+ rtreport()
+ rtreport( 'REPO TOP:')
+ svn=alias(exe('svn'))
+ info=alias(svn['info'])
+ try:
+ with produtil.cd.NamedDir(checkout_top):
+ rtreport(runstr(info['.']))
+ status=runstr(svn['status',checkout_top])
+ for line in status.splitlines():
+ m=re.match('X\s+(.*)',line)
+ if not m:
+ continue
+ rtreport('EXTERNAL %s:'%(m.group(1),))
+ rtreport(runstr(info[os.path.join(checkout_top,m.group(1))]))
+ except(ValueError,KeyError,ExitStatusException,EnvironmentError) as e:
+ print 'WARNING: Could not complete subversion checks: '+str(e)
itest=0
success=True
Index: checkout/tests
===================================================================
--- checkout/tests (revision 99229)
+++ checkout/tests (revision 99527)
Property changes on: checkout/tests
___________________________________________________________________
Modified: svn:externals
## -1 +1 ##
-produtil -r98242 https://svnemc.ncep.noaa.gov/projects/nceplibs/produtil/branches/regtests-run
+produtil -r99526 https://svnemc.ncep.noaa.gov/projects/nceplibs/produtil/branches/regtests-run
Index: checkout/src/module_EARTH_GRID_COMP.F90
===================================================================
--- checkout/src/module_EARTH_GRID_COMP.F90 (revision 99229)
+++ checkout/src/module_EARTH_GRID_COMP.F90 (revision 99527)
@@ -2545,6 +2545,42 @@
endif
if (.not.NUOPC_FieldDictionaryHasEntry( &
+ "eastward_wave_radiation_stress")) then
+ call NUOPC_FieldDictionaryAddEntry( &
+ standardName="eastward_wave_radiation_stress", &
+ canonicalUnits="N m-1", &
+ rc=rc)
+ if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
+ line=__LINE__, &
+ file=__FILE__)) &
+ return ! bail out
+ endif
+
+ if (.not.NUOPC_FieldDictionaryHasEntry( &
+ "eastward_northward_wave_radiation_stress")) then
+ call NUOPC_FieldDictionaryAddEntry( &
+ standardName="eastward_northward_wave_radiation_stress", &
+ canonicalUnits="N m-1", &
+ rc=rc)
+ if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
+ line=__LINE__, &
+ file=__FILE__)) &
+ return ! bail out
+ endif
+
+ if (.not.NUOPC_FieldDictionaryHasEntry( &
+ "northward_wave_radiation_stress")) then
+ call NUOPC_FieldDictionaryAddEntry( &
+ standardName="northward_wave_radiation_stress", &
+ canonicalUnits="N m-1", &
+ rc=rc)
+ if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
+ line=__LINE__, &
+ file=__FILE__)) &
+ return ! bail out
+ endif
+
+ if (.not.NUOPC_FieldDictionaryHasEntry( &
"wave_induced_charnock_parameter")) then
call NUOPC_FieldDictionaryAddEntry( &
standardName="wave_induced_charnock_parameter", &
--=_5a5681e1.HpmjfLYB/lN1wTrEZEd3f5umDP0zmXFLmMfpd8kGGXKVZm41--
More information about the Ncep.list.nems.announce
mailing list