Skip to content

Commit

Permalink
Add new config variable 'histaux_enabled'
Browse files Browse the repository at this point in the history 
Use this variable to turn on writing histaux files every MED_history_n.
By default it is .false.
Currently only cpld_control_nowave_noaero_p8 test has it turned on.
  • Loading branch information
@DusanJovic-NOAA
DusanJovic-NOAA committed Dec 10, 2024
1 parent f089968 commit 441a09f
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 112 deletions.
222 changes: 112 additions & 110 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,116 +7,118 @@
#
###############################################################################

THRD=1

export INPES_atmaero=4
export JNPES_atmaero=8
export WPG_atmaero=6

export THRD_cpl_atmw=1
export INPES_cpl_atmw=3
export JNPES_cpl_atmw=8
export WPG_cpl_atmw=6
export WAV_tasks_cpl_atmw=30
export WAV_thrds_cpl_atmw=1

export THRD_cpl_c48=1
export INPES_cpl_c48=1
export JNPES_cpl_c48=1
export WPG_cpl_c48=6
export OCN_tasks_cpl_c48=4
export ICE_tasks_cpl_c48=4

export THRD_cpl_dflt=1
export INPES_cpl_dflt=3
export JNPES_cpl_dflt=8;
export WPG_cpl_dflt=6
export OCN_tasks_cpl_dflt=20
export ICE_tasks_cpl_dflt=10
export WAV_tasks_cpl_dflt=20

export THRD_cpl_thrd=2
export INPES_cpl_thrd=3
export JNPES_cpl_thrd=4
export WPG_cpl_thrd=6
export OCN_tasks_cpl_thrd=20
export OCN_thrds_cpl_thrd=1
export ICE_tasks_cpl_thrd=10
export ICE_thrds_cpl_thrd=1
export WAV_tasks_cpl_thrd=12
export WAV_thrds_cpl_thrd=2

export THRD_cpl_dcmp=1
export INPES_cpl_dcmp=4
export JNPES_cpl_dcmp=6
export WPG_cpl_dcmp=6
export OCN_tasks_cpl_dcmp=20
export ICE_tasks_cpl_dcmp=10
export WAV_tasks_cpl_dcmp=20

export THRD_cpl_mpi=1
export INPES_cpl_mpi=4
export JNPES_cpl_mpi=8
export WPG_cpl_mpi=6
export OCN_tasks_cpl_mpi=34
export ICE_tasks_cpl_mpi=20
export WAV_tasks_cpl_mpi=28

export THRD_cpl_bmrk=2
export INPES_cpl_bmrk=8
export JNPES_cpl_bmrk=8
export WPG_cpl_bmrk=48
export OCN_tasks_cpl_bmrk=120
export OCN_thrds_cpl_bmrk=1
export ICE_tasks_cpl_bmrk=48
export ICE_thrds_cpl_bmrk=1
export WAV_tasks_cpl_bmrk=80
export WAV_thrds_cpl_bmrk=2

export THRD_cpl_c192=2
export INPES_cpl_c192=6
export JNPES_cpl_c192=8
export WPG_cpl_c192=12
export OCN_tasks_cpl_c192=60
export ICE_tasks_cpl_c192=24
export WAV_tasks_cpl_c192=80

export ATM_compute_tasks_cdeps_100=12
export OCN_tasks_cdeps_100=16
export ICE_tasks_cdeps_100=12

export ATM_compute_tasks_cdeps_025=40
export OCN_tasks_cdeps_025=120
export ICE_tasks_cdeps_025=48

export INPES_aqm=33
export JNPES_aqm=8

export THRD_cpl_unstr=1
export INPES_cpl_unstr=3
export JNPES_cpl_unstr=8
export WPG_cpl_unstr=6
export OCN_tasks_cpl_unstr=20
export ICE_tasks_cpl_unstr=10
export WAV_tasks_cpl_unstr=60

export THRD_cpl_unstr_mpi=1
export INPES_cpl_unstr_mpi=4
export JNPES_cpl_unstr_mpi=8
export WPG_cpl_unstr_mpi=6
export OCN_tasks_cpl_unstr_mpi=34
export ICE_tasks_cpl_unstr_mpi=20
export WAV_tasks_cpl_unstr_mpi=50

export aqm_omp_num_threads=1
export atm_omp_num_threads=1
export chm_omp_num_threads=1
export ice_omp_num_threads=1
export lnd_omp_num_threads=1
export med_omp_num_threads=1
export ocn_omp_num_threads=1
export wav_omp_num_threads=1
export fbh_omp_num_threads=1
THRD=1

export INPES_atmaero=4
export JNPES_atmaero=8
export WPG_atmaero=6

export THRD_cpl_atmw=1
export INPES_cpl_atmw=3
export JNPES_cpl_atmw=8
export WPG_cpl_atmw=6
export WAV_tasks_cpl_atmw=30
export WAV_thrds_cpl_atmw=1

export THRD_cpl_c48=1
export INPES_cpl_c48=1
export JNPES_cpl_c48=1
export WPG_cpl_c48=6
export OCN_tasks_cpl_c48=4
export ICE_tasks_cpl_c48=4

export THRD_cpl_dflt=1
export INPES_cpl_dflt=3
export JNPES_cpl_dflt=8;
export WPG_cpl_dflt=6
export OCN_tasks_cpl_dflt=20
export ICE_tasks_cpl_dflt=10
export WAV_tasks_cpl_dflt=20

export THRD_cpl_thrd=2
export INPES_cpl_thrd=3
export JNPES_cpl_thrd=4
export WPG_cpl_thrd=6
export OCN_tasks_cpl_thrd=20
export OCN_thrds_cpl_thrd=1
export ICE_tasks_cpl_thrd=10
export ICE_thrds_cpl_thrd=1
export WAV_tasks_cpl_thrd=12
export WAV_thrds_cpl_thrd=2

export THRD_cpl_dcmp=1
export INPES_cpl_dcmp=4
export JNPES_cpl_dcmp=6
export WPG_cpl_dcmp=6
export OCN_tasks_cpl_dcmp=20
export ICE_tasks_cpl_dcmp=10
export WAV_tasks_cpl_dcmp=20

export THRD_cpl_mpi=1
export INPES_cpl_mpi=4
export JNPES_cpl_mpi=8
export WPG_cpl_mpi=6
export OCN_tasks_cpl_mpi=34
export ICE_tasks_cpl_mpi=20
export WAV_tasks_cpl_mpi=28

export THRD_cpl_bmrk=2
export INPES_cpl_bmrk=8
export JNPES_cpl_bmrk=8
export WPG_cpl_bmrk=48
export OCN_tasks_cpl_bmrk=120
export OCN_thrds_cpl_bmrk=1
export ICE_tasks_cpl_bmrk=48
export ICE_thrds_cpl_bmrk=1
export WAV_tasks_cpl_bmrk=80
export WAV_thrds_cpl_bmrk=2

export THRD_cpl_c192=2
export INPES_cpl_c192=6
export JNPES_cpl_c192=8
export WPG_cpl_c192=12
export OCN_tasks_cpl_c192=60
export ICE_tasks_cpl_c192=24
export WAV_tasks_cpl_c192=80

export ATM_compute_tasks_cdeps_100=12
export OCN_tasks_cdeps_100=16
export ICE_tasks_cdeps_100=12

export ATM_compute_tasks_cdeps_025=40
export OCN_tasks_cdeps_025=120
export ICE_tasks_cdeps_025=48

export INPES_aqm=33
export JNPES_aqm=8

export THRD_cpl_unstr=1
export INPES_cpl_unstr=3
export JNPES_cpl_unstr=8
export WPG_cpl_unstr=6
export OCN_tasks_cpl_unstr=20
export ICE_tasks_cpl_unstr=10
export WAV_tasks_cpl_unstr=60

export THRD_cpl_unstr_mpi=1
export INPES_cpl_unstr_mpi=4
export JNPES_cpl_unstr_mpi=8
export WPG_cpl_unstr_mpi=6
export OCN_tasks_cpl_unstr_mpi=34
export ICE_tasks_cpl_unstr_mpi=20
export WAV_tasks_cpl_unstr_mpi=50

export aqm_omp_num_threads=1
export atm_omp_num_threads=1
export chm_omp_num_threads=1
export ice_omp_num_threads=1
export lnd_omp_num_threads=1
export med_omp_num_threads=1
export ocn_omp_num_threads=1
export wav_omp_num_threads=1
export fbh_omp_num_threads=1

export histaux_enabled=.false.

if [[ ${MACHINE_ID} = wcoss2 || ${MACHINE_ID} = acorn ]]; then

Expand Down
4 changes: 2 additions & 2 deletions tests/parm/ufs.configure.s2s.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,14 @@ MED_attributes::
ocean_albedo_limit = @[ocean_albedo_limit]
histaux_ice2med_file1_auxname = ice.1h.aux
histaux_ice2med_file1_doavg = .false.
histaux_ice2med_file1_enabled = .true.
histaux_ice2med_file1_enabled = @[histaux_enabled]
histaux_ice2med_file1_flds = all
histaux_ice2med_file1_history_n = @[MED_history_n]
histaux_ice2med_file1_history_option = nhours
histaux_ice2med_file1_ntperfile = 9999
histaux_ocn2med_file1_auxname = ocn.1h.aux
histaux_ocn2med_file1_doavg = .false.
histaux_ocn2med_file1_enabled = .true.
histaux_ocn2med_file1_enabled = @[histaux_enabled]
histaux_ocn2med_file1_flds = all
histaux_ocn2med_file1_history_n = @[MED_history_n]
histaux_ocn2med_file1_history_option = nhours
Expand Down
2 changes: 2 additions & 0 deletions tests/tests/cpld_control_nowave_noaero_p8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,5 @@ export N_SPLIT=5
# HR4 GFSv17 GWD update
export DO_GWD_OPT_PSL=.true.
export DO_GSL_DRAG_SS=.false.

export histaux_enabled=.true.

0 comments on commit 441a09f

Please sign in to comment.