From 5038ed510fa6cac42bccbf97b4f2bc1ac54e2f6d Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Wed, 7 Feb 2024 12:16:58 -0500 Subject: [PATCH 1/5] add traditional threading version files for a atm, atmaero and leapfrom atm/wave global ufs.configure files --- tests/parm/ufs.configure.atm.IN | 3 +- tests/parm/ufs.configure.atm_esmf.IN | 27 ++++++++++++ tests/parm/ufs.configure.atmaero.IN | 4 +- tests/parm/ufs.configure.atmaero_esmf.IN | 40 ++++++++++++++++++ tests/parm/ufs.configure.leapfrog_atm_wav.IN | 4 +- .../ufs.configure.leapfrog_atm_wav_esmf.IN | 41 +++++++++++++++++++ 6 files changed, 111 insertions(+), 8 deletions(-) create mode 100644 tests/parm/ufs.configure.atm_esmf.IN create mode 100644 tests/parm/ufs.configure.atmaero_esmf.IN create mode 100644 tests/parm/ufs.configure.leapfrog_atm_wav_esmf.IN diff --git a/tests/parm/ufs.configure.atm.IN b/tests/parm/ufs.configure.atm.IN index 8eb7b94dc7..3b6a305247 100644 --- a/tests/parm/ufs.configure.atm.IN +++ b/tests/parm/ufs.configure.atm.IN @@ -4,7 +4,7 @@ # ESMF # logKindFlag: @[esmf_logkind] -globalResourceControl: true +globalResourceControl: false # EARTH # EARTH_component_list: ATM @@ -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 diff --git a/tests/parm/ufs.configure.atm_esmf.IN b/tests/parm/ufs.configure.atm_esmf.IN new file mode 100644 index 0000000000..8eb7b94dc7 --- /dev/null +++ b/tests/parm/ufs.configure.atm_esmf.IN @@ -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 +:: diff --git a/tests/parm/ufs.configure.atmaero.IN b/tests/parm/ufs.configure.atmaero.IN index 0c20f20905..6c60333e07 100644 --- a/tests/parm/ufs.configure.atmaero.IN +++ b/tests/parm/ufs.configure.atmaero.IN @@ -4,7 +4,7 @@ # ESMF # logKindFlag: @[esmf_logkind] -globalResourceControl: true +globalResourceControl: false # EARTH # EARTH_component_list: ATM CHM @@ -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 :: @@ -23,7 +22,6 @@ ATM_attributes:: # CHM # CHM_model: @[chm_model] CHM_petlist_bounds: @[chm_petlist_bounds] -CHM_omp_num_threads: @[chm_omp_num_threads] CHM_attributes:: Verbosity = 0 :: diff --git a/tests/parm/ufs.configure.atmaero_esmf.IN b/tests/parm/ufs.configure.atmaero_esmf.IN new file mode 100644 index 0000000000..0c20f20905 --- /dev/null +++ b/tests/parm/ufs.configure.atmaero_esmf.IN @@ -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 + @ +:: diff --git a/tests/parm/ufs.configure.leapfrog_atm_wav.IN b/tests/parm/ufs.configure.leapfrog_atm_wav.IN index c4b6055fd1..fe33f5da9f 100644 --- a/tests/parm/ufs.configure.leapfrog_atm_wav.IN +++ b/tests/parm/ufs.configure.leapfrog_atm_wav.IN @@ -4,7 +4,7 @@ # ESMF # logKindFlag: @[esmf_logkind] -globalResourceControl: true +globalResourceControl: false # EARTH # EARTH_component_list: ATM WAV @@ -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] @@ -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 :: diff --git a/tests/parm/ufs.configure.leapfrog_atm_wav_esmf.IN b/tests/parm/ufs.configure.leapfrog_atm_wav_esmf.IN new file mode 100644 index 0000000000..c4b6055fd1 --- /dev/null +++ b/tests/parm/ufs.configure.leapfrog_atm_wav_esmf.IN @@ -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 + @ +:: From d8a840cd98266a3dc5a900750922ab952c98c814 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Wed, 7 Feb 2024 12:20:56 -0500 Subject: [PATCH 2/5] update test configurations for updated template names --- tests/default_vars.sh | 2 +- tests/tests/atmaero_control_p8 | 2 +- tests/tests/atmaero_control_p8_rad | 2 +- tests/tests/atmaero_control_p8_rad_micro | 2 +- tests/tests/control_c384gdas_wav | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 570b6e9cae..31ffedf0d7 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -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 diff --git a/tests/tests/atmaero_control_p8 b/tests/tests/atmaero_control_p8 index 3c33bc75f7..f9e0a09b1e 100644 --- a/tests/tests/atmaero_control_p8 +++ b/tests/tests/atmaero_control_p8 @@ -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' diff --git a/tests/tests/atmaero_control_p8_rad b/tests/tests/atmaero_control_p8_rad index 0c57cc52e0..05ac7156b7 100644 --- a/tests/tests/atmaero_control_p8_rad +++ b/tests/tests/atmaero_control_p8_rad @@ -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' diff --git a/tests/tests/atmaero_control_p8_rad_micro b/tests/tests/atmaero_control_p8_rad_micro index f3908676ff..c2a4171008 100644 --- a/tests/tests/atmaero_control_p8_rad_micro +++ b/tests/tests/atmaero_control_p8_rad_micro @@ -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' diff --git a/tests/tests/control_c384gdas_wav b/tests/tests/control_c384gdas_wav index c6f768ae95..3669edccb0 100644 --- a/tests/tests/control_c384gdas_wav +++ b/tests/tests/control_c384gdas_wav @@ -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' From 7a5a401615d910de1a3b1d70a58d4a41e262c1e2 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Thu, 7 Mar 2024 10:54:52 -0500 Subject: [PATCH 3/5] revert tests to traditional threading --- tests/default_vars.sh | 2 +- tests/tests/atmaero_control_p8 | 2 +- tests/tests/atmaero_control_p8_rad | 2 +- tests/tests/atmaero_control_p8_rad_micro | 2 +- tests/tests/control_c384gdas_wav | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index f46e790668..01b67e2731 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -314,7 +314,7 @@ export DumpFields="false" export_fv3 () { # 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 diff --git a/tests/tests/atmaero_control_p8 b/tests/tests/atmaero_control_p8 index f9e0a09b1e..3c33bc75f7 100644 --- a/tests/tests/atmaero_control_p8 +++ b/tests/tests/atmaero_control_p8 @@ -66,7 +66,7 @@ export WRITE_DOPOST=.true. export CPL=.true. export CPLCHM=.true. -export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN +export UFS_CONFIGURE=ufs.configure.atmaero.IN export atm_model='fv3' export chm_model='gocart' diff --git a/tests/tests/atmaero_control_p8_rad b/tests/tests/atmaero_control_p8_rad index 05ac7156b7..0c57cc52e0 100644 --- a/tests/tests/atmaero_control_p8_rad +++ b/tests/tests/atmaero_control_p8_rad @@ -65,7 +65,7 @@ export WRITE_DOPOST=.true. export CPL=.true. export CPLCHM=.true. -export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN +export UFS_CONFIGURE=ufs.configure.atmaero.IN export atm_model='fv3' export chm_model='gocart' diff --git a/tests/tests/atmaero_control_p8_rad_micro b/tests/tests/atmaero_control_p8_rad_micro index c2a4171008..f3908676ff 100644 --- a/tests/tests/atmaero_control_p8_rad_micro +++ b/tests/tests/atmaero_control_p8_rad_micro @@ -65,7 +65,7 @@ export WRITE_DOPOST=.true. export CPL=.true. export CPLCHM=.true. -export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN +export UFS_CONFIGURE=ufs.configure.atmaero.IN export atm_model='fv3' export chm_model='gocart' diff --git a/tests/tests/control_c384gdas_wav b/tests/tests/control_c384gdas_wav index 3669edccb0..c6f768ae95 100644 --- a/tests/tests/control_c384gdas_wav +++ b/tests/tests/control_c384gdas_wav @@ -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_esmf.IN" +export UFS_CONFIGURE="ufs.configure.leapfrog_atm_wav.IN" export atm_model='fv3' export wav_model='ww3' export WW3OUTPUTTYPE=' 1' From c61f374d6f72a57c1f506a2bff4b37d375d038f9 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Thu, 7 Mar 2024 13:42:53 -0500 Subject: [PATCH 4/5] use the updated template names for esmf-threading as in develop --- tests/default_vars.sh | 2 +- tests/tests/atmaero_control_p8 | 2 +- tests/tests/atmaero_control_p8_rad | 2 +- tests/tests/atmaero_control_p8_rad_micro | 2 +- tests/tests/control_c384gdas_wav | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index f46e790668..01b67e2731 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -314,7 +314,7 @@ export DumpFields="false" export_fv3 () { # 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 diff --git a/tests/tests/atmaero_control_p8 b/tests/tests/atmaero_control_p8 index f9e0a09b1e..3c33bc75f7 100644 --- a/tests/tests/atmaero_control_p8 +++ b/tests/tests/atmaero_control_p8 @@ -66,7 +66,7 @@ export WRITE_DOPOST=.true. export CPL=.true. export CPLCHM=.true. -export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN +export UFS_CONFIGURE=ufs.configure.atmaero.IN export atm_model='fv3' export chm_model='gocart' diff --git a/tests/tests/atmaero_control_p8_rad b/tests/tests/atmaero_control_p8_rad index 05ac7156b7..0c57cc52e0 100644 --- a/tests/tests/atmaero_control_p8_rad +++ b/tests/tests/atmaero_control_p8_rad @@ -65,7 +65,7 @@ export WRITE_DOPOST=.true. export CPL=.true. export CPLCHM=.true. -export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN +export UFS_CONFIGURE=ufs.configure.atmaero.IN export atm_model='fv3' export chm_model='gocart' diff --git a/tests/tests/atmaero_control_p8_rad_micro b/tests/tests/atmaero_control_p8_rad_micro index c2a4171008..f3908676ff 100644 --- a/tests/tests/atmaero_control_p8_rad_micro +++ b/tests/tests/atmaero_control_p8_rad_micro @@ -65,7 +65,7 @@ export WRITE_DOPOST=.true. export CPL=.true. export CPLCHM=.true. -export UFS_CONFIGURE=ufs.configure.atmaero_esmf.IN +export UFS_CONFIGURE=ufs.configure.atmaero.IN export atm_model='fv3' export chm_model='gocart' diff --git a/tests/tests/control_c384gdas_wav b/tests/tests/control_c384gdas_wav index 3669edccb0..c6f768ae95 100644 --- a/tests/tests/control_c384gdas_wav +++ b/tests/tests/control_c384gdas_wav @@ -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_esmf.IN" +export UFS_CONFIGURE="ufs.configure.leapfrog_atm_wav.IN" export atm_model='fv3' export wav_model='ww3' export WW3OUTPUTTYPE=' 1' From 815cb2269b9d83d37cb93fedbb7796b17ec5fbd4 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Thu, 7 Mar 2024 13:46:09 -0500 Subject: [PATCH 5/5] use the updated template names for esmf-threading as in develop --- tests/default_vars.sh | 2 +- tests/tests/atmaero_control_p8 | 2 +- tests/tests/atmaero_control_p8_rad | 2 +- tests/tests/atmaero_control_p8_rad_micro | 2 +- tests/tests/control_c384gdas_wav | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 01b67e2731..f46e790668 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -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 diff --git a/tests/tests/atmaero_control_p8 b/tests/tests/atmaero_control_p8 index 3c33bc75f7..f9e0a09b1e 100644 --- a/tests/tests/atmaero_control_p8 +++ b/tests/tests/atmaero_control_p8 @@ -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' diff --git a/tests/tests/atmaero_control_p8_rad b/tests/tests/atmaero_control_p8_rad index 0c57cc52e0..05ac7156b7 100644 --- a/tests/tests/atmaero_control_p8_rad +++ b/tests/tests/atmaero_control_p8_rad @@ -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' diff --git a/tests/tests/atmaero_control_p8_rad_micro b/tests/tests/atmaero_control_p8_rad_micro index f3908676ff..c2a4171008 100644 --- a/tests/tests/atmaero_control_p8_rad_micro +++ b/tests/tests/atmaero_control_p8_rad_micro @@ -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' diff --git a/tests/tests/control_c384gdas_wav b/tests/tests/control_c384gdas_wav index c6f768ae95..3669edccb0 100644 --- a/tests/tests/control_c384gdas_wav +++ b/tests/tests/control_c384gdas_wav @@ -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'