Skip to content

Commit

Permalink
VLab Issue #40738.
Browse files Browse the repository at this point in the history
Add mpi_barrier per Rahul's suggestion.

Squashed commit of the following:

commit 1e81e040d7c07e6ed7bbdd540ce1e9333d3c3286
Author: George Gayno <george.gayno@noaa.gov>
Date:   Tue Dec 5 20:57:56 2017 +0000

    cycle_gg branch:  This commit references #40738.

    Update/add prologs to "cycle.f90" AND "read_write_data.f90".
    Replace calls to "errexit" with "mpi_abort".

    Add compiler flag "-fp-model precise" to be consistent with the
    CHGRES program.  This will hopefully prevent differences
    returned from shared routine "sfcsub.f".

    Change-Id: I2306f9fa77f719c6e5c88f51cfc67da1990f10f2

commit 56e62e81acd5e5371f488650ae365fb736cf0bd9
Author: George Gayno <george.gayno@noaa.gov>
Date:   Mon Dec 4 20:50:44 2017 +0000

    cycle_gg branch:  This commit references #40738.

    cycle.f90 - The current workflow may over-specify the number of
    mpi tasks.  Add logic to not run program for any ranks greater
    than MAX_RANKS minus 1.  Update prologs.

    global_cycle.sh - Update prolog.  Add MAX_RANKS variable.

commit 928f9c8b582a0ddbaf5f0a99108fe4f4ca39a734
Merge: 50349b5 1a6ae93
Author: George Gayno <george.gayno@noaa.gov>
Date:   Mon Dec 4 17:21:03 2017 +0000

    cycle_gg branch:  This commit references #40738.

    Merge branch 'master' into cycle_gg

commit 50349b5734d6bb590ccfe79e79b213fa10783265
Author: George Gayno <george.gayno@noaa.gov>
Date:   Mon Nov 20 14:46:17 2017 +0000

    cycle_gg branch:  This commit references #40738.

    Per Rahul's suggestion, use the F90 versions of all NetCDF functions.

commit 335f3382199ae8c56b93c89851efd76390e184a6
Merge: e224a91 41a6c5b
Author: George Gayno <george.gayno@noaa.gov>
Date:   Wed Nov 15 15:19:24 2017 +0000

    Merge branch 'master' into cycle_gg

commit e224a918b6c289a3b97685537fb1b5d714a5bdd8
Author: George Gayno <george.gayno@noaa.gov>
Date:   Wed Nov 15 14:33:16 2017 +0000

    cycle_gg branch:  This commit references #40738.

    Update CYCLE build module for phase 1/2 to invoke mpi compilation.
    Remove usused C-compiler variable from cray build module.

commit 8a5d6d4641397a323f934f3f60e1188e798f8dfe
Author: George Gayno <george.gayno@noaa.gov>
Date:   Tue Nov 14 18:40:48 2017 +0000

    cycle_gg branch:  This commit references #40738

    Update comment block of global_cycle.sh.

commit 6704c44e417d1d86c067a49d940aa8bf8c771cda
Author: George Gayno <george.gayno@noaa.gov>
Date:   Mon Nov 13 15:35:45 2017 +0000

    cycle_gg branch:  This commit refs #40738.

    Add MPI directives to CYCLE so multiple tiles may be processed
    simultaneously.

commit 497462dd763f1c3c690feb9229f8313aada36094
Author: George Gayno <george.gayno@noaa.gov>
Date:   Wed Nov 8 15:11:25 2017 +0000

    Remove unused libraries from global_cycle build.

commit fc99588d85a28ce9de699209ab5e0ae58912ca90
Author: George Gayno <george.gayno@noaa.gov>
Date:   Fri Nov 3 20:35:17 2017 +0000

    Added two run-time options to global_cycle program: (1) pass-thru nsst records
    but do not update them (2) only perform nsst adjustments
    using gsi increments.  Do not process surface fields.

    Change-Id: Ida4626a5cd82e4a8a74975befddbf981a00329ff
  • Loading branch information
GeorgeGayno-NOAA committed Dec 8, 2017
1 parent 89feb84 commit 8585699
Show file tree
Hide file tree
Showing 9 changed files with 765 additions and 616 deletions.
1 change: 1 addition & 0 deletions global_shared.v15.0.0/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix
4 changes: 0 additions & 4 deletions global_shared.v15.0.0/modulefiles/fv3gfs/global_cycle.cray
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,9 @@ module load craype-haswell
module load cray-netcdf

# Load NCEPLIBS modules
module load sigio-intel/2.0.1
module load w3nco-intel/2.0.6
module load w3emc-intel/2.2.0
module load sp-intel/2.0.2
module load ip-intel/3.0.0
module load sfcio-intel/1.0.0
module load bacio-intel/2.0.1

setenv FCMP ftn
setenv CCMP cc
8 changes: 2 additions & 6 deletions global_shared.v15.0.0/modulefiles/fv3gfs/global_cycle.theia
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,18 @@
#############################################################

# Loading Intel Compiler Suite
module load intel/14.0.2
module load intel/16.1.150
module load impi

# Loding nceplibs modules
module use -a /scratch3/NCEPDEV/nwprod/lib/modulefiles
module load sigio/v2.0.1
module load w3nco/v2.0.6
module load w3emc/v2.2.0
module load sp/v2.0.2
module load bacio/v2.0.1
module load ip/v3.0.0
module load sfcio/v1.0.0
module load netcdf/4.3.0
module load hdf5/1.8.14
export NETCDF_INCLUDE="-I${NETCDF}/include"
export NETCDF_LDFLAGS_F="-L${NETCDF}/lib -lnetcdf -lnetcdff -L${HDF5}/lib -lhdf5 -lhdf5_fortran"

set FCMP ifort
set CCMP icc
export FCMP=mpiifort
9 changes: 3 additions & 6 deletions global_shared.v15.0.0/modulefiles/fv3gfs/global_cycle.wcoss
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,14 @@ puts stderr "for WCOSS Phase 1/2.\n"
module-whatis "global_cycle"

# Loading Intel Compiler Suite
module load ics/14.0.1
module load ics/16.0.3
module load ibmpe/1.3.0.12

# Loading nceplibs modules
module load sigio/v2.0.1
module load w3nco/v2.0.6
module load w3emc/v2.2.0
module load sp/v2.0.2
module load bacio/v2.0.2
module load ip/v3.0.0
module load sfcio/v1.0.0
module load NetCDF/4.2/serial

setenv FCMP ifort
setenv CCMP icc
setenv FCMP mpfort
Loading

0 comments on commit 8585699

Please sign in to comment.