Skip to content

March 31, 2020 - Jules Kouatchou #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

March 31, 2020 - Jules Kouatchou #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3d1fb32
March 31, 2020 - Jules Kouatchou
Mar 31, 2020
464de8d
Merge branch 'master' into jkGEOSctm_on_SLESS12
mathomp4 Apr 3, 2020
f6239c6
**Decade Transition**
Apr 27, 2020
5795f93
Additional environment variable settings when Intel MPI is used.
Apr 27, 2020
f024838
Made the following changes:
Apr 28, 2020
d5351b0
Made the following changes:
May 11, 2020
448e763
Edited the files Externals.cfg and components.yaml to set newer
Jun 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
required = True
repo_url = [email protected]:GEOS-ESM/ESMA_env.git
local_path = ./@env
tag = v2.0.2
tag = v2.1.5
protocol = git

[ESMA_cmake]
required = True
repo_url = [email protected]:GEOS-ESM/ESMA_cmake.git
local_path = ./@cmake
tag = v2.1.2
tag = v3.0.3
externals = Externals.cfg
protocol = git

Expand All @@ -25,7 +25,7 @@ sparse = ../../../config/GMAO_Shared.sparse
required = True
repo_url = [email protected]:GEOS-ESM/MAPL.git
local_path = ./src/Shared/@MAPL
tag = v2.0.0
tag = v2.1.4
protocol = git

[FVdycoreCubed_GridComp]
Expand Down
6 changes: 3 additions & 3 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
env:
local: ./@env
remote: ../ESMA_env.git
tag: v2.0.2
tag: v2.1.5
develop: master

cmake:
local: ./@cmake
remote: ../ESMA_cmake.git
tag: v2.1.2
tag: v3.0.3
develop: develop

ecbuild:
Expand All @@ -25,7 +25,7 @@ GMAO_Shared:
MAPL:
local: ./src/Shared/@MAPL
remote: ../MAPL.git
tag: v2.0.0
tag: v2.1.4
develop: develop

FMS:
Expand Down
20 changes: 10 additions & 10 deletions src/Applications/GEOSctm_App/MERRA2_ExtData.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ PrimaryExports%%
#------------
# Climatilogy
#------------
FRLAND '1' Y N 0 0.0 1.0 FRLAND /discover/nobackup/projects/gmi/gmidata2/input/metfields/rawMERRA2/MERRA2_400.const_2d_asm_Nx.climatology.nc4
FRLAKE '1' Y N 0 0.0 1.0 FRLAKE /discover/nobackup/projects/gmi/gmidata2/input/metfields/rawMERRA2/MERRA2_400.const_2d_asm_Nx.climatology.nc4
FRLANDICE '1' Y N 0 0.0 1.0 FRLANDICE /discover/nobackup/projects/gmi/gmidata2/input/metfields/rawMERRA2/MERRA2_400.const_2d_asm_Nx.climatology.nc4
FROCEAN '1' Y N 0 0.0 1.0 FROCEAN /discover/nobackup/projects/gmi/gmidata2/input/metfields/rawMERRA2/MERRA2_400.const_2d_asm_Nx.climatology.nc4
SGH 'm' Y N 0 0.0 1.0 SGH /discover/nobackup/projects/gmi/gmidata2/input/metfields/rawMERRA2/MERRA2_400.const_2d_asm_Nx.climatology.nc4
FRLAND '1' Y N 0 0.0 1.0 FRLAND /discover/nobackup/projects/gmi/gmidata2/input/metfields/rawMERRA2/MERRA2_301.const_2d_ctm_Nx.00000000.nc4
FRLAKE '1' Y N 0 0.0 1.0 FRLAKE /discover/nobackup/projects/gmi/gmidata2/input/metfields/rawMERRA2/MERRA2_301.const_2d_ctm_Nx.00000000.nc4
FRLANDICE '1' Y N 0 0.0 1.0 FRLANDICE /discover/nobackup/projects/gmi/gmidata2/input/metfields/rawMERRA2/MERRA2_301.const_2d_ctm_Nx.00000000.nc4
FROCEAN '1' Y N 0 0.0 1.0 FROCEAN /discover/nobackup/projects/gmi/gmidata2/input/metfields/rawMERRA2/MERRA2_301.const_2d_ctm_Nx.00000000.nc4

#-------------
# 2D Variables
Expand Down Expand Up @@ -49,7 +48,6 @@ RHOA '1' N N 0 0.0 1.0
CM '1' N N 0 0.0 1.0 CDM /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg1_2d_flx_Nx.%y4%m2%d2.nc4
CN '1' N N 0 0.0 1.0 CN /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg1_2d_flx_Nx.%y4%m2%d2.nc4
TA 'K' N N 0 0.0 1.0 TLML /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg1_2d_flx_Nx.%y4%m2%d2.nc4
PS 'Pa' N N 0 0.0 1.0 PS /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg1_2d_slv_Nx.%y4%m2%d2.nc4
SLP 'Pa' N N 0 0.0 1.0 SLP /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg1_2d_slv_Nx.%y4%m2%d2.nc4
TROPP 'Pa' N N 0 0.0 1.0 TROPPB /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg1_2d_slv_Nx.%y4%m2%d2.nc4
T10M 'K' N N 0 0.0 1.0 T10M /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg1_2d_slv_Nx.%y4%m2%d2.nc4
Expand All @@ -68,7 +66,7 @@ PHIS 'm+2 s-2' N N 0 0.0 1.0
#---------------------
# 3D variables at edge
#---------------------
PLE 'Pa' N N 0 0.0 1.0 PLE /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_nav_Ne.%y4%m2%d2.nc4
#PLE 'Pa' N N 0 0.0 1.0 PLE /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_nav_Ne.%y4%m2%d2.nc4
ZLE 'm' N N 0 0.0 1.0 ZLE /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_nav_Ne.%y4%m2%d2.nc4
KH 'm+2 s-1' N N 0 0.0 1.0 KH /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_trb_Ne.%y4%m2%d2.nc4
CNV_MFC 'kg m-2 s-1' N N 0 0.0 1.0 CMFMC /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_mst_Ne.%y4%m2%d2.nc4
Expand All @@ -95,7 +93,6 @@ FCLD '1' N N 0 0.0 1.0
CNV_MFD 'kg m-2 s-1' N N 0 0.0 1.0 DTRAIN /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_cld_Nv.%y4%m2%d2.nc4
TAUCLW '1' N N 0 0.0 1.0 TAUCLW /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_cld_Nv.%y4%m2%d2.nc4
TAUCLI '1' N N 0 0.0 1.0 TAUCLI /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_cld_Nv.%y4%m2%d2.nc4
DELP 'Pa' N N 0 0.0 1.0 DELP /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_cld_Nv.%y4%m2%d2.nc4
QLTOT1 'kg kg-1' N N 0;-@nhmsDT 0.0 1.0 QL /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.inst3_3d_asm_Nv.%y4%m2%d2.nc4
QITOT1 'kg kg-1' N N 0;-@nhmsDT 0.0 1.0 QI /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.inst3_3d_asm_Nv.%y4%m2%d2.nc4
U 'm s-1' N N 0 0.0 1.0 U /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.inst3_3d_asm_Nv.%y4%m2%d2.nc4
Expand All @@ -117,8 +114,11 @@ DQLDT 'kg/kg/s' N N 0 0.0 1.0
#----------------
#AdvCore Specific
#----------------
PLE0 'Pa' N N 0 0.0 1.0 PLE /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_nav_Ne.%y4%m2%d2.nc4
PLE1 'Pa' N N 0;@nhmsDT 0.0 1.0 PLE /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_nav_Ne.%y4%m2%d2.nc4
PS 'Pa' N N 0 0.0 1.0 PS /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.inst3_3d_aer_Nv.%y4%m2%d2.nc4
PS0 'Pa' N N 0 0.0 1.0 PS /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.inst3_3d_aer_Nv.%y4%m2%d2.nc4
PS1 'Pa' N N 0;@nhmsDT 0.0 1.0 PS /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.inst3_3d_aer_Nv.%y4%m2%d2.nc4
#PLE0 'Pa' N N 0 0.0 1.0 PLE /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_nav_Ne.%y4%m2%d2.nc4
#PLE1 'Pa' N N 0;@nhmsDT 0.0 1.0 PLE /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.tavg3_3d_nav_Ne.%y4%m2%d2.nc4
UC0;VC0 'm s-1' N N 0 0.0 1.0 U;V /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.inst3_3d_asm_Nv.%y4%m2%d2.nc4
UC1;VC1 'm s-1' N N 0;@nhmsDT 0.0 1.0 U;V /discover/nobackup/projects/gmao/merra2/data/products/d5124_m2_@sMonth/Y%y4/M%m2/@MERRA2type.inst3_3d_asm_Nv.%y4%m2%d2.nc4
%%
Expand Down
16 changes: 13 additions & 3 deletions src/Applications/GEOSctm_App/ctm_run.j
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ umask 022

limit stacksize unlimited

@SETENVS

#######################################################################
# Configuration Settings
Expand Down Expand Up @@ -518,11 +517,16 @@ if( ${DRIVING_DATASETS} == MERRA2) then
set sMonth = jan00
set MERRA2type = MERRA2_300
set data_Transition_Date = 20100101
else if( $startYear > 2009 ) then
else if( $startYear > 2009 && $startYear < 2020 ) then
set sYear = 2010
set sMonth = jan10
set MERRA2type = MERRA2_400
set data_Transition_Date = 20200101
else if( $startYear > 2019 ) then
set sYear = 2020
set sMonth = jan10
set MERRA2type = MERRA2_400
set data_Transition_Date = 20300101
endif

set newstring = "EXTDATA_CF: ${COMPNAME}_ExtData_${sYear}.rc"
Expand Down Expand Up @@ -892,14 +896,20 @@ python bundleParser.py
setenv YEAR $yearc
./linkbcs

@SETENVS

# Run GEOSctm.x
# -------------
if( $USE_SHMEM == 1 ) $GEOSBIN/RmShmKeys_sshmpi.csh
@ NPES = $NX * $NY
$RUN_CMD $NPES ./GEOSctm.x
if( $USE_SHMEM == 1 ) $GEOSBIN/RmShmKeys_sshmpi.csh

set rc = $status
if( -e EGRESS ) then
set rc = 0
else
set rc = -1
endif

echo GEOSctm Run Status: $rc

Expand Down
3 changes: 3 additions & 0 deletions src/Applications/GEOSctm_App/ctm_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,9 @@ else if( $MPI == intelmpi ) then

cat > $HOMDIR/SETENV.commands << EOF
setenv I_MPI_DAPL_UD enable
setenv I_MPI_SHM_HEAP_VSIZE 512
setenv I_MPI_ADJUST_ALLREDUCE 12
setenv I_MPI_ADJUST_GATHERV 3
EOF

endif # if mpi
Expand Down
23 changes: 6 additions & 17 deletions src/Components/GEOSctm_GridComp/CTMconvection_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
esma_set_this ()

if (Convection_MODE MATCHES stub)
set (SRCS
CTM_ConvectionStubCompMod.F90
GenericConvectionMethod_mod.F90
GmiConvectionMethod_mod.F90
convectiveTransport_mod.F90
CTM_rasCalculationsMod.F90
)
else ()
set (SRCS
CTM_ConvectionGridCompMod.F90
GenericConvectionMethod_mod.F90
GmiConvectionMethod_mod.F90
convectiveTransport_mod.F90
CTM_rasCalculationsMod.F90
)
endif ()
set (SRCS
CTM_ConvectionGridCompMod.F90
GmiConvectionMethod_mod.F90
convectiveTransport_mod.F90
CTM_rasCalculationsMod.F90
)

esma_add_library (${this}
SRCS ${SRCS}
Expand Down
Loading