[Ncep.list.nems.announce] nems r90943: NEMS trunk code and test script changes:

Samuel.Trahan at noaa.gov Samuel.Trahan at noaa.gov
Thu Apr 6 18:58:05 UTC 2017


1. Removal o...
Message-ID: <58e68fbd.5r0zVmd/GN4Qprpr%Samuel.Trahan at noaa.gov>
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: multipart/mixed;
 boundary="=_58e68fbd.psl+rMgbAGUK7FoF8JBel3r7MRIxH/L5L6IF8W3mWXvH80ZJ"

This is a multi-part message in MIME format.

--=_58e68fbd.psl+rMgbAGUK7FoF8JBel3r7MRIxH/L5L6IF8W3mWXvH80ZJ
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: 90943
Author:   samuel.trahan at noaa.gov
Date:     2017-04-06T18:52:26.664656Z
Message:
NEMS trunk code and test script changes:

1. Removal of three debug statements that cause vast amounts of
output.  (Thanks to Jim Abeles for noticing them).  Two were related
to the resource usage reporting, and one was a nuopc driver debug
message.

2. On WCOSS Cray, point to a later version of Rocoto that has a
workaround for common errors in bashrc files.  These errors happen due
to a very specific combination of factors that only exist on WCOSS Cray.

3. Point NEMS/tests/produtil external to top of produtil.  This adds
various features needed by upcoming application-level commits.


See attached file for full differences.


First 4000 bytes of differences:
Index: checkout/tests/rtgen
===================================================================
--- checkout/tests/rtgen	(revision 89904)
+++ checkout/tests/rtgen	(revision 90943)
@@ -561,7 +561,7 @@
         elif here.name in [ 'surge', 'luna' ]:
             out.write('module load xt-lsfhpc\n')
             out.write('module use /usrx/local/emc_rocoto/modulefiles\n')
-            out.write('module load rocoto\n')
+            out.write('module load rocoto/issue_8\n')
             out.write('module use /gpfs/hps/emc/hwrf/noscrub/soft/modulefiles\n')
             out.write('module load emc-utils ; have_qoutq=YES\n')
         elif here.name == 'theia':
Index: checkout/tests/rt.sh
===================================================================
--- checkout/tests/rt.sh	(revision 89904)
+++ checkout/tests/rt.sh	(revision 90943)
@@ -47,6 +47,8 @@
 RUNDIR=''
 PLATFORM_NAME=''
 
+export PYTHONPATH=$( pwd -P )/produtil/ush${PYTHONPATH:+:$PYTHONPATH}
+
 while getopts ":c:fst:n:hr:p:" opt; do
     case $opt in
         r)
@@ -217,4 +219,4 @@
     echo "and rtrun to re-run failed tests."
 fi
 
-exit $status
\ No newline at end of file
+exit $status
Index: checkout/tests
===================================================================
--- checkout/tests	(revision 89904)
+++ checkout/tests	(revision 90943)

Property changes on: checkout/tests
___________________________________________________________________
Modified: svn:externals
## -1 +1 ##
-produtil -r89259 https://svnemc.ncep.noaa.gov/projects/nceplibs/produtil/branches/regtests-run
+produtil -r90581 https://svnemc.ncep.noaa.gov/projects/nceplibs/produtil/branches/regtests-run
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /nems/branches/crayfix/tests:r90333-90926
Index: checkout/src/module_EARTH_GRID_COMP.F90
===================================================================
--- checkout/src/module_EARTH_GRID_COMP.F90	(revision 89904)
+++ checkout/src/module_EARTH_GRID_COMP.F90	(revision 90943)
@@ -160,12 +160,28 @@
       PRIVATE
 !
       PUBLIC :: EARTH_REGISTER
+      PUBLIC :: VERBOSE_DIAGNOSTICS
 !
 !-----------------------------------------------------------------------
 !
 
+      LOGICAL, PRIVATE :: flag_verbose_diagnostics = .false.
+
+
       CONTAINS
 
+      logical function verbose_diagnostics(set)
+        !! Mutator for the verbose diagnostics flag; returns true if
+        !! verbose diagnostics should be used, and false otherwise.
+        !! If the "set" argument is present, then the flag is set to
+        !! the given value.
+        logical, optional :: set
+        if(present(set)) then
+           flag_verbose_diagnostics=set
+        endif
+        verbose_diagnostics=flag_verbose_diagnostics
+      end function verbose_diagnostics
+
 !-----------------------------------------------------------------------
 !#######################################################################
 !-----------------------------------------------------------------------
@@ -3242,9 +3258,11 @@
       line=__LINE__, file=trim(name)//":"//__FILE__)) return  ! bail out
 
     ! Diagnostic output
-    call NUOPC_DriverPrint(driver, orderflag=.true., rc=rc)
-    if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
-      line=__LINE__, file=trim(name)//":"//__FILE__)) return  ! bail out
+    if(verbose_diagnostics()) then
+       call NUOPC_DriverPrint(driver, orderflag=.true., rc=rc)
+       if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
+            line=__LINE__, file=trim(name)//":"//__FILE__)) return  ! bail out
+    endif
     
   end subroutine
     
Index: checkout/src/module_NEMS_Rusage.F90
===================================================================
--- checkout/src/module_NEMS_Rusage.F90	(revision 89904)
+++ checkout/src/module_NEMS_Rusage.F90	(revision 90943)
@@ -300,10 +300,6 @@
        do i=1,ru%m_comm_size_hosts
           namedispl(i+1)=namedispl(i)+namesizes(i)
        enddo
-       do i=1,ru%m_comm_size_hosts
-       


... see attachment for the rest ...

--=_58e68fbd.psl+rMgbAGUK7FoF8JBel3r7MRIxH/L5L6IF8W3mWXvH80ZJ
Content-Type: text/plain;
 charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="90943.diff"

Index: checkout/tests/rtgen
===================================================================
--- checkout/tests/rtgen	(revision 89904)
+++ checkout/tests/rtgen	(revision 90943)
@@ -561,7 +561,7 @@
         elif here.name in [ 'surge', 'luna' ]:
             out.write('module load xt-lsfhpc\n')
             out.write('module use /usrx/local/emc_rocoto/modulefiles\n')
-            out.write('module load rocoto\n')
+            out.write('module load rocoto/issue_8\n')
             out.write('module use /gpfs/hps/emc/hwrf/noscrub/soft/modulefiles\n')
             out.write('module load emc-utils ; have_qoutq=YES\n')
         elif here.name == 'theia':
Index: checkout/tests/rt.sh
===================================================================
--- checkout/tests/rt.sh	(revision 89904)
+++ checkout/tests/rt.sh	(revision 90943)
@@ -47,6 +47,8 @@
 RUNDIR=''
 PLATFORM_NAME=''
 
+export PYTHONPATH=$( pwd -P )/produtil/ush${PYTHONPATH:+:$PYTHONPATH}
+
 while getopts ":c:fst:n:hr:p:" opt; do
     case $opt in
         r)
@@ -217,4 +219,4 @@
     echo "and rtrun to re-run failed tests."
 fi
 
-exit $status
\ No newline at end of file
+exit $status
Index: checkout/tests
===================================================================
--- checkout/tests	(revision 89904)
+++ checkout/tests	(revision 90943)

Property changes on: checkout/tests
___________________________________________________________________
Modified: svn:externals
## -1 +1 ##
-produtil -r89259 https://svnemc.ncep.noaa.gov/projects/nceplibs/produtil/branches/regtests-run
+produtil -r90581 https://svnemc.ncep.noaa.gov/projects/nceplibs/produtil/branches/regtests-run
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /nems/branches/crayfix/tests:r90333-90926
Index: checkout/src/module_EARTH_GRID_COMP.F90
===================================================================
--- checkout/src/module_EARTH_GRID_COMP.F90	(revision 89904)
+++ checkout/src/module_EARTH_GRID_COMP.F90	(revision 90943)
@@ -160,12 +160,28 @@
       PRIVATE
 !
       PUBLIC :: EARTH_REGISTER
+      PUBLIC :: VERBOSE_DIAGNOSTICS
 !
 !-----------------------------------------------------------------------
 !
 
+      LOGICAL, PRIVATE :: flag_verbose_diagnostics = .false.
+
+
       CONTAINS
 
+      logical function verbose_diagnostics(set)
+        !! Mutator for the verbose diagnostics flag; returns true if
+        !! verbose diagnostics should be used, and false otherwise.
+        !! If the "set" argument is present, then the flag is set to
+        !! the given value.
+        logical, optional :: set
+        if(present(set)) then
+           flag_verbose_diagnostics=set
+        endif
+        verbose_diagnostics=flag_verbose_diagnostics
+      end function verbose_diagnostics
+
 !-----------------------------------------------------------------------
 !#######################################################################
 !-----------------------------------------------------------------------
@@ -3242,9 +3258,11 @@
       line=__LINE__, file=trim(name)//":"//__FILE__)) return  ! bail out
 
     ! Diagnostic output
-    call NUOPC_DriverPrint(driver, orderflag=.true., rc=rc)
-    if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
-      line=__LINE__, file=trim(name)//":"//__FILE__)) return  ! bail out
+    if(verbose_diagnostics()) then
+       call NUOPC_DriverPrint(driver, orderflag=.true., rc=rc)
+       if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
+            line=__LINE__, file=trim(name)//":"//__FILE__)) return  ! bail out
+    endif
     
   end subroutine
     
Index: checkout/src/module_NEMS_Rusage.F90
===================================================================
--- checkout/src/module_NEMS_Rusage.F90	(revision 89904)
+++ checkout/src/module_NEMS_Rusage.F90	(revision 90943)
@@ -300,10 +300,6 @@
        do i=1,ru%m_comm_size_hosts
           namedispl(i+1)=namedispl(i)+namesizes(i)
        enddo
-       do i=1,ru%m_comm_size_hosts
-          print '(I0,": size=",I0," displ=",I0)', i, namesizes(i), namedispl(i)
-       enddo
-       print '("end: displ=",I0)', namedispl(ru%m_comm_size_hosts+1)
        flush(6)
        if(ru%m_master) then
           size=namedispl(ru%m_comm_size_hosts+1)
Index: checkout/src
===================================================================
--- checkout/src	(revision 89904)
+++ checkout/src	(revision 90943)

Property changes on: checkout/src
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /nems/branches/crayfix/src:r90333-90926
Index: checkout
===================================================================
--- checkout	(revision 89904)
+++ checkout	(revision 90943)

Property changes on: checkout
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /nems/branches/crayfix:r90333-90926

--=_58e68fbd.psl+rMgbAGUK7FoF8JBel3r7MRIxH/L5L6IF8W3mWXvH80ZJ--


More information about the Ncep.list.nems.announce mailing list