Skip to content
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

Jump to bottom

Add traditional threading templates for global apps and append _esmf for templates using ESMF-managed threading. #2179

Closed
wants to merge 7 commits into from
Closed

Add traditional threading templates for global apps and append _esmf for templates using ESMF-managed threading. #2179

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
5038ed5
add traditional threading version files for a atm, atmaero and leapfr…
aerorahul Feb 7, 2024
d8a840c
update test configurations for updated template names
aerorahul Feb 7, 2024
a07bd60
Merge branch 'develop' into feature/ufs-threading
aerorahul Mar 5, 2024
7a5a401
revert tests to traditional threading
aerorahul Mar 7, 2024
c61f374
use the updated template names for esmf-threading as in develop
aerorahul Mar 7, 2024
5186106
Merge branch 'feature/ufs-threading' of https://github.com/aerorahul/…
aerorahul Mar 7, 2024
815cb22
use the updated template names for esmf-threading as in develop
aerorahul Mar 7, 2024
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
2 changes: 1 addition & 1 deletion tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ export DumpFields="false"
export_fv3 ()
{
# ufs.configure defaults
export UFS_CONFIGURE=ufs.configure.atm.IN
export UFS_CONFIGURE=ufs.configure.atm_esmf.IN
export MODEL_CONFIGURE=model_configure.IN
export atm_model=fv3

Expand Down
3 changes: 1 addition & 2 deletions tests/parm/ufs.configure.atm.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: @[esmf_logkind]
globalResourceControl: true
globalResourceControl: false

# EARTH #
EARTH_component_list: ATM
Expand All @@ -15,7 +15,6 @@ EARTH_attributes::
# ATM #
ATM_model: @[atm_model]
ATM_petlist_bounds: @[atm_petlist_bounds]
ATM_omp_num_threads: @[atm_omp_num_threads]
ATM_attributes::
Verbosity = 0
Diagnostic = 0
Expand Down
27 changes: 27 additions & 0 deletions tests/parm/ufs.configure.atm_esmf.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#############################################
#### UFS Run-Time Configuration File ######
#############################################

# ESMF #
logKindFlag: @[esmf_logkind]
globalResourceControl: true

# EARTH #
EARTH_component_list: ATM
EARTH_attributes::
Verbosity = 0
::

# ATM #
ATM_model: @[atm_model]
ATM_petlist_bounds: @[atm_petlist_bounds]
ATM_omp_num_threads: @[atm_omp_num_threads]
ATM_attributes::
Verbosity = 0
Diagnostic = 0
::

# Run Sequence #
runSeq::
ATM
::
4 changes: 1 addition & 3 deletions tests/parm/ufs.configure.atmaero.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: @[esmf_logkind]
globalResourceControl: true
globalResourceControl: false

# EARTH #
EARTH_component_list: ATM CHM
Expand All @@ -15,15 +15,13 @@ EARTH_attributes::
# ATM #
ATM_model: @[atm_model]
ATM_petlist_bounds: @[atm_petlist_bounds]
ATM_omp_num_threads: @[atm_omp_num_threads]
ATM_attributes::
Verbosity = 0
::

# CHM #
CHM_model: @[chm_model]
CHM_petlist_bounds: @[chm_petlist_bounds]
CHM_omp_num_threads: @[chm_omp_num_threads]
CHM_attributes::
Verbosity = 0
::
Expand Down
40 changes: 40 additions & 0 deletions tests/parm/ufs.configure.atmaero_esmf.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#############################################
#### UFS Run-Time Configuration File ######
#############################################

# ESMF #
logKindFlag: @[esmf_logkind]
globalResourceControl: true

# EARTH #
EARTH_component_list: ATM CHM
EARTH_attributes::
Verbosity = 0
::

# ATM #
ATM_model: @[atm_model]
ATM_petlist_bounds: @[atm_petlist_bounds]
ATM_omp_num_threads: @[atm_omp_num_threads]
ATM_attributes::
Verbosity = 0
::

# CHM #
CHM_model: @[chm_model]
CHM_petlist_bounds: @[chm_petlist_bounds]
CHM_omp_num_threads: @[chm_omp_num_threads]
CHM_attributes::
Verbosity = 0
::

# Run Sequence #
runSeq::
@@[coupling_interval_sec]
ATM phase1
ATM -> CHM
CHM
CHM -> ATM
ATM phase2
@
::
4 changes: 1 addition & 3 deletions tests/parm/ufs.configure.leapfrog_atm_wav.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: @[esmf_logkind]
globalResourceControl: true
globalResourceControl: false

# EARTH #
EARTH_component_list: ATM WAV
Expand All @@ -15,7 +15,6 @@ EARTH_attributes::
# ATM #
ATM_model: @[atm_model]
ATM_petlist_bounds: @[atm_petlist_bounds]
ATM_omp_num_threads: @[atm_omp_num_threads]
ATM_attributes::
Verbosity = 0
DumpFields = @[DumpFields]
Expand All @@ -24,7 +23,6 @@ ATM_attributes::
# WAV #
WAV_model: @[wav_model]
WAV_petlist_bounds: @[wav_petlist_bounds]
WAV_omp_num_threads: @[wav_omp_num_threads]
WAV_attributes::
Verbosity = 0
::
Expand Down
41 changes: 41 additions & 0 deletions tests/parm/ufs.configure.leapfrog_atm_wav_esmf.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#############################################
#### UFS Run-Time Configuration File ######
#############################################

# ESMF #
logKindFlag: @[esmf_logkind]
globalResourceControl: true

# EARTH #
EARTH_component_list: ATM WAV
EARTH_attributes::
Verbosity = 0
::

# ATM #
ATM_model: @[atm_model]
ATM_petlist_bounds: @[atm_petlist_bounds]
ATM_omp_num_threads: @[atm_omp_num_threads]
ATM_attributes::
Verbosity = 0
DumpFields = @[DumpFields]
::

# WAV #
WAV_model: @[wav_model]
WAV_petlist_bounds: @[wav_petlist_bounds]
WAV_omp_num_threads: @[wav_omp_num_threads]
WAV_attributes::
Verbosity = 0
::



# Run Sequence #
runSeq::
@@[coupling_interval_sec]
ATM
ATM -> WAV
WAV
@
::
2 changes: 1 addition & 1 deletion tests/tests/atmaero_control_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export WRITE_DOPOST=.true.

export CPL=.true.
export CPLCHM=.true.
export UFS_CONFIGURE=ufs.configure.atmaero.IN
export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN

export atm_model='fv3'
export chm_model='gocart'
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/atmaero_control_p8_rad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export WRITE_DOPOST=.true.

export CPL=.true.
export CPLCHM=.true.
export UFS_CONFIGURE=ufs.configure.atmaero.IN
export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN

export atm_model='fv3'
export chm_model='gocart'
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/atmaero_control_p8_rad_micro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export WRITE_DOPOST=.true.

export CPL=.true.
export CPLCHM=.true.
export UFS_CONFIGURE=ufs.configure.atmaero.IN
export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN

export atm_model='fv3'
export chm_model='gocart'
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/control_c384gdas_wav
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"

export CPL=.true.
export CPLWAV=.true.
export UFS_CONFIGURE="ufs.configure.leapfrog_atm_wav.IN"
export UFS_CONFIGURE="ufs.configure.leapfrog_atm_wav_esmf.IN"
export atm_model='fv3'
export wav_model='ww3'
export WW3OUTPUTTYPE=' 1'
Expand Down