Skip to content

Commit

Permalink
Add support for traditional threading. 'ESMF threading' is still default
Browse files Browse the repository at this point in the history
  • Loading branch information
@DusanJovic-NOAA
DusanJovic-NOAA committed Dec 5, 2024
1 parent a3c3bb5 commit 5485db8
Show file tree
Hide file tree
Showing 57 changed files with 243 additions and 760 deletions.
5 changes: 3 additions & 2 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ export CMP_DATAONLY=false

# Defaults for ufs.configure
export esmf_logkind="ESMF_LOGKIND_MULTI"
export ESMF_THREADING=true
export DumpFields="false"
export MED_history_n=1000000

Expand Down Expand Up @@ -504,7 +505,7 @@ else
fi

# ufs.configure defaults
export UFS_CONFIGURE=ufs.configure.atm_esmf.IN
export UFS_CONFIGURE=ufs.configure.atm.IN
export MODEL_CONFIGURE=model_configure.IN
export atm_model=fv3

Expand Down Expand Up @@ -1342,7 +1343,7 @@ export_fire_behavior() {

# Defaults for the coupled 5-component
export_cmeps() {
export UFS_CONFIGURE=ufs.configure.s2swa_fast_esmf.IN
export UFS_CONFIGURE=ufs.configure.s2swa_fast.IN
export med_model=cmeps
export atm_model=fv3
export chm_model=gocart
Expand Down
3 changes: 2 additions & 1 deletion tests/fv3_conf/fv3_qsub.IN_acorn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
#PBS -l walltime=00:@[WLCLK]:00

set -eux
echo -n " $( date +%s )," > job_timestamp.txt

cd $PBS_O_WORKDIR

echo -n " $( date +%s )," > job_timestamp.txt

set +x
module use $PWD/modulefiles
module load modules.fv3
Expand Down
3 changes: 2 additions & 1 deletion tests/fv3_conf/fv3_qsub.IN_wcoss2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
#PBS -l walltime=00:@[WLCLK]:00

set -eux
echo -n " $( date +%s )," > job_timestamp.txt

cd $PBS_O_WORKDIR

echo -n " $( date +%s )," > job_timestamp.txt

set +x
module use $PWD/modulefiles
module load modules.fv3
Expand Down
Empty file modified tests/parm/params_grib2_tbl_new
100755 → 100644
View file
Empty file.
3 changes: 2 additions & 1 deletion tests/parm/ufs.configure.atm.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

# EARTH #
EARTH_component_list: ATM
Expand All @@ -15,6 +15,7 @@ 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: 0 additions & 27 deletions tests/parm/ufs.configure.atm_esmf.IN
View file

This file was deleted.

2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.atm_lm4.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: MED ATM LND
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.atm_lnd.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: MED ATM LND
Expand Down
4 changes: 3 additions & 1 deletion tests/parm/ufs.configure.atmaero.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

# EARTH #
EARTH_component_list: ATM CHM
Expand All @@ -15,13 +15,15 @@ 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: 0 additions & 40 deletions tests/parm/ufs.configure.atmaero_esmf.IN
View file

This file was deleted.

2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.atmaq.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: ATM AQM
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.atmw.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: MED ATM WAV
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.blocked_atm_wav.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: ATM WAV
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.blocked_atm_wav_2way.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: ATM WAV
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.cpld_atm_fbh.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: ATM FBH
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.datm_cdeps.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: MED ATM OCN ICE
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.hafs_atm.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: ATM
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.hafs_atm_docn.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: MED ATM OCN
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.hafs_atm_ocn.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: MED ATM OCN
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI_ON
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: MED ATM OCN WAV
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI_ON
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: MED ATM OCN WAV
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI_ON
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: MED ATM OCN WAV
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/ufs.configure.hafs_atm_wav.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# ESMF #
logKindFlag: ESMF_LOGKIND_MULTI_ON
globalResourceControl: true
globalResourceControl: @[ESMF_THREADING]

# EARTH #
EARTH_component_list: MED ATM WAV
Expand Down
4 changes: 3 additions & 1 deletion tests/parm/ufs.configure.leapfrog_atm_wav.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

# EARTH #
EARTH_component_list: ATM WAV
Expand All @@ -15,6 +15,7 @@ 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 @@ -23,6 +24,7 @@ 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: 0 additions & 41 deletions tests/parm/ufs.configure.leapfrog_atm_wav_esmf.IN
View file

This file was deleted.

Loading

0 comments on commit 5485db8

Please sign in to comment.