From 6792ae315d59369982bc5e5d3dffc197dc188863 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 20 Aug 2024 11:35:37 -0400 Subject: [PATCH 01/21] point to develop branch of ccpp-framework --- .gitmodules | 2 +- ccpp/framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index dc0798c32..56dee3ba7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "ccpp-framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework - branch = main + branch = develop [submodule "ccpp-physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index 0f8232724..af90b948b 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 0f8232724975c13289cad390c9a71fa2c6a9bff4 +Subproject commit af90b948b85b88649547b49d28ba98fd5cb8c4b1 From 1a3bb7245cc03d8fea213c7699e91c989c81606f Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 27 Aug 2024 18:06:05 -0400 Subject: [PATCH 02/21] fix chap_quick.rst that was not merged correctly from previous PR --- scm/doc/TechGuide/chap_quick.rst | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/scm/doc/TechGuide/chap_quick.rst b/scm/doc/TechGuide/chap_quick.rst index 5c7880535..df96e0f40 100644 --- a/scm/doc/TechGuide/chap_quick.rst +++ b/scm/doc/TechGuide/chap_quick.rst @@ -216,13 +216,6 @@ Unified Forecast System and related applications, only a minority of which are r install libraries manually if they wish, but they will need to make sure the appropriate environment variables are set to the correct values so that the build system can find them, as described in the following paragraphs. - -<<<<<<< HEAD -Setting up compilation environment -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -For users on a pre-configured platform, the spack-stack environment can be loaded via one of the provided modules in ``scm/etc/modules/`` as described in :numref:`Section %s `. -======= For users on a pre-configured platform, you can load the spack-stack environment via one of the provided modules in ``scm/etc/modules/``. For example, users on the NSF NCAR machine Derecho who wish to use Intel compilers can do the following: @@ -231,7 +224,6 @@ For example, users on the NSF NCAR machine Derecho who wish to use Intel compile cd [path/to/ccpp-scm/] module use scm/etc/modules/ module load derecho_intel ->>>>>>> feature/modulefile_updates Additionally, for users who have installed spack-stack on their own MacOS or Linux machine can use the provided ``macos_clang`` or ``linux_gnu`` modules. @@ -613,11 +605,7 @@ configuration files located in ``../etc/case_config`` (*without the .nml extensi specifying a suite other than the default, the suite name used must match the value of the suite name in one of the suite definition files located in ``../../ccpp/suites`` (Note: not the filename of the suite definition file). As -<<<<<<< HEAD -part of the CCPP SCM v7.0.0 release, the following suite names are supported: -======= part of the seventh CCPP release, the following suite names are supported: ->>>>>>> feature/modulefile_updates #. SCM_GFS_v16 From 1d2f8c290d0496ad27d449279808409664906f76 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 27 Aug 2024 22:42:02 -0400 Subject: [PATCH 03/21] add info regarding the save_comp option in UFS_case_gen.py --- scm/doc/TechGuide/chap_cases.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scm/doc/TechGuide/chap_cases.rst b/scm/doc/TechGuide/chap_cases.rst index a9c9bbdaa..48e02aed4 100644 --- a/scm/doc/TechGuide/chap_cases.rst +++ b/scm/doc/TechGuide/chap_cases.rst @@ -422,6 +422,16 @@ appreciably different than the calculated geostrophic winds), this often leads t with time. An option exists within the script to assume that the mean three-dimensional winds are, in fact, identical to the geostrophic winds as well. Using this option eliminates any spurious turning. +Writing UFS Comparison Data + +The `--save_comp` (or `-sc`) options allow one to write out the UFS data for the chosen column in NetCDF format. The profiles of the state variables +`u`, `v`, `T`, and `q_v` are written out for the given point for each history file time. In addition, a collection of other +diagnostics like profiles of physics tendencies and scalar surface variables are saved and written. One can include any variable that is +provided in the UFS history files, although the specific variables are hard-coded in the `UFS_case_gen.py` file which will require editing +to change. The file with comparison data is automatically written out to the `scm/data/comparison_data` directory, although this is controlled +by the `COMPARISON_DATA_DIR` global variable in the `UFS_case_gen.py` script. The filename is a concatenation of the case name (specified by the +`--case_name (-n)` argument) and `_comp_data.nc`. + .. _`ufsforcingensemblegenerator`: UFS_forcing_ensemble_generator.py From 6ebd581494db21bcfd91edc28e8091d61f659f8d Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 28 Aug 2024 16:50:14 -0400 Subject: [PATCH 04/21] update chap_cases.rst --- scm/doc/TechGuide/chap_cases.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/scm/doc/TechGuide/chap_cases.rst b/scm/doc/TechGuide/chap_cases.rst index 48e02aed4..92c86ff36 100644 --- a/scm/doc/TechGuide/chap_cases.rst +++ b/scm/doc/TechGuide/chap_cases.rst @@ -298,6 +298,21 @@ Activate environment: > conda activate env_ufscasegen +.. note:: + +It may be possible for conda to fail to solve for the environment when attempting to use the yml file. It +should still be possible to create the same environment manually: +.. code:: bash + + > conda create --name env_ufscasegen + > conda install -n env_ufscasegen --channel=conda-forge python=3.8.5 + > conda install -n env_ufscasegen --channel=conda-forge netcdf4 + > conda install -n env_ufscasegen --channel=conda-forge f90nml + > conda install -n env_ufscasegen --channel=conda-forge xarray + > conda install -n env_ufscasegen --channel=conda-forge numpy + > conda install -n env_ufscasegen --channel=conda-forge shapely + > conda install -n env_ufscasegen --channel=conda-forge xesmf + .. _`ufscasegen`: UFS_case_gen.py From a3027672adeece43bfc445261fcc9cd65d063126 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 28 Aug 2024 17:42:59 -0400 Subject: [PATCH 05/21] add optional arguments for UFS_case_gen examples --- scm/doc/TechGuide/chap_cases.rst | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scm/doc/TechGuide/chap_cases.rst b/scm/doc/TechGuide/chap_cases.rst index 92c86ff36..032d2227a 100644 --- a/scm/doc/TechGuide/chap_cases.rst +++ b/scm/doc/TechGuide/chap_cases.rst @@ -453,7 +453,8 @@ UFS_forcing_ensemble_generator.py ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ There is an additional script in ``scm/etc/scripts/UFS_forcing_ensemble_generator.py`` to create UFS-caseGen case(s) starting -with output from UFS Weather Model (UWM) Regression Tests (RTs). +with output from UFS Weather Model (UWM) Regression Tests (RTs). This script provides a wrapper for ``UFS_case_gen.py`` for +generating multiple cases at once. .. code:: bash @@ -514,11 +515,12 @@ staged UWM RTs located at: Example 1: UFS-caseGen for single point ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -UFS regression test, ``control_c192``, for single point. +UFS regression test, ``control_c192``, for a single point using calculated horizontal advective tendencies, +supplying the vertical velocity for the vertical advective terms and nudging the horizontal winds: .. code:: bash - ./UFS_forcing_ensemble_generator.py -d [path_to_regression_tests_output]/control_c192_intel/ -sc --C_RES 192 -dt 360 -n control_c192 -lons 300 -lats 34 + ./UFS_forcing_ensemble_generator.py -d [path_to_regression_tests_output]/control_c192_intel/ -sc --C_RES 192 -dt 360 -n control_c192 -lons 300 -lats 34 -fm 2 -vm 2 -wn Upon successful completion of the script, the command to run the case(s) will print to the screen. For example, @@ -534,11 +536,11 @@ The file ``scm_ufsens_control_c192.py`` is created in ``ccpp-scm/scm/bin/``, whe Example 2: UFS-caseGen for list of points ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -UFS regression test, ``control_c384``, for multiple points. +UFS regression test, ``control_c384``, for multiple points assuming the same forcing method as above: .. code:: bash - ./UFS_forcing_ensemble_generator.py -d /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/NEMSfv3gfs/develop-20240607/control_c384_intel/ -sc --C_RES 384 -dt 225 -n control_c384 -lons 300 300 300 300 -lats 34 35 35 37 + ./UFS_forcing_ensemble_generator.py -d /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/NEMSfv3gfs/develop-20240607/control_c384_intel/ -sc --C_RES 384 -dt 225 -n control_c384 -lons 300 300 300 300 -lats 34 35 35 37 -fm 2 -vm 2 -wn Upon successful completion of the script, the command to run the case(s) will print to the screen. For example, From 2ef6259a2daa50d63eea7ee97721d0124b1c199a Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 28 Aug 2024 17:44:59 -0400 Subject: [PATCH 06/21] fix formatting error --- scm/doc/TechGuide/chap_cases.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/scm/doc/TechGuide/chap_cases.rst b/scm/doc/TechGuide/chap_cases.rst index 032d2227a..eec004dea 100644 --- a/scm/doc/TechGuide/chap_cases.rst +++ b/scm/doc/TechGuide/chap_cases.rst @@ -302,6 +302,7 @@ Activate environment: It may be possible for conda to fail to solve for the environment when attempting to use the yml file. It should still be possible to create the same environment manually: + .. code:: bash > conda create --name env_ufscasegen From 1e402c7c43bae505f2512ffbc4570e350496fdba Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 28 Aug 2024 17:51:29 -0400 Subject: [PATCH 07/21] fix formatting error --- scm/doc/TechGuide/chap_cases.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scm/doc/TechGuide/chap_cases.rst b/scm/doc/TechGuide/chap_cases.rst index eec004dea..780eb2f1f 100644 --- a/scm/doc/TechGuide/chap_cases.rst +++ b/scm/doc/TechGuide/chap_cases.rst @@ -297,10 +297,8 @@ Activate environment: .. code:: bash > conda activate env_ufscasegen - -.. note:: -It may be possible for conda to fail to solve for the environment when attempting to use the yml file. It +Note that it may be possible for conda to fail to solve for the environment when attempting to use the yml file. It should still be possible to create the same environment manually: .. code:: bash From 923d03254267525319dc1870a58b47a323c76f83 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 4 Sep 2024 22:11:37 -0400 Subject: [PATCH 08/21] update ccpp/physics submodule pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index f0fbb34a3..da75531bf 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit f0fbb34a350acac90e71de6e51351f78174eb8de +Subproject commit da75531bf90a799e4c0dcb988cc591d82bd024de From 02d490a5eab589c0fd0be2e4ab991562aea1804b Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 5 Sep 2024 14:54:19 +0000 Subject: [PATCH 09/21] Add yaml script for python environment used in online tutorial. --- environment-tutorial.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 environment-tutorial.yml diff --git a/environment-tutorial.yml b/environment-tutorial.yml new file mode 100644 index 000000000..e64d9d7d8 --- /dev/null +++ b/environment-tutorial.yml @@ -0,0 +1,7 @@ +name: scm_py37_tutorial + +dependencies: + - conda-forge::python=3.7 + - conda-forge::netcdf4 + - conda-forge::f90nml + - conda-forge::configobj From 361ab1161cba963f12112c2704b798da371ad1b3 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 5 Sep 2024 14:59:01 +0000 Subject: [PATCH 10/21] Renamed to match online tutorial --- environment-tutorial.yml => environment-scm_analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename environment-tutorial.yml => environment-scm_analysis.yml (83%) diff --git a/environment-tutorial.yml b/environment-scm_analysis.yml similarity index 83% rename from environment-tutorial.yml rename to environment-scm_analysis.yml index e64d9d7d8..298dbf072 100644 --- a/environment-tutorial.yml +++ b/environment-scm_analysis.yml @@ -1,4 +1,4 @@ -name: scm_py37_tutorial +name: env_scm_analysis dependencies: - conda-forge::python=3.7 From 999ab8864a5cdc52f7bddb4954e58ba96bdd56cc Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 5 Sep 2024 15:36:07 -0400 Subject: [PATCH 11/21] update twpice_all_suites.ini to use supported suites for v7 --- scm/etc/scripts/plot_configs/twpice_all_suites.ini | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scm/etc/scripts/plot_configs/twpice_all_suites.ini b/scm/etc/scripts/plot_configs/twpice_all_suites.ini index 1cc5b1da0..47cf2d1e5 100644 --- a/scm/etc/scripts/plot_configs/twpice_all_suites.ini +++ b/scm/etc/scripts/plot_configs/twpice_all_suites.ini @@ -1,5 +1,5 @@ -scm_datasets = output_twpice_SCM_GFS_v16/output.nc, output_twpice_SCM_GFS_v17_p8/output.nc, output_twpice_SCM_RAP/output.nc, output_twpice_SCM_RRFS_v1beta/output.nc, output_twpice_SCM_WoFS_v0/output.nc, output_twpice_SCM_HRRR/output.nc -scm_datasets_labels = GFSv16, GFSv17p8, RAP, RRFSv1b, WoFSv0, HRRR +scm_datasets = output_twpice_SCM_GFS_v16/output.nc, output_twpice_SCM_GFS_v16_RRTMGP/output.nc, output_twpice_SCM_GFS_v17_p8_ugwpv1/output.nc, output_twpice_SCM_WoFS_v0/output.nc, output_twpice_SCM_HRRR_gf/output.nc +scm_datasets_labels = GFSv16, GFSv16-GP, GFSv17p8-ugwpv1, WoFSv0, HRRR-gf plot_dir = plots_twpice_all_suites/ obs_file = ../data/raw_case_input/twp180iopsndgvarana_v2.1_C3.c1.20060117.000000.cdf obs_compare = True @@ -38,9 +38,10 @@ time_series_resample = True [[profiles_instant]] [[time_series]] - vars = 'pres_s','lhf','shf','tprcp_rate_inst' + vars = 'pres_s','lhf','shf','tprcp_rate_accum' vars_labels = 'surface pressure (Pa)','latent heat flux ($W$ $m^{-2}$)','sensible heat flux ($W$ $m^{-2}$)','surface rainfall rate ($mm$ $hr{-1}$)' - + conversion_factor = 1.0, 1.0, 1.0, 3600000.0 + [[contours]] vars = qv, vars_labels = 'Water Vapor ($g$ $kg^{-1}$)', From 5f747c927a202ec4f9c00b3a5bc7fbc7e7bd03e8 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Fri, 6 Sep 2024 14:00:34 -0600 Subject: [PATCH 12/21] Adding documentation on run_scm.py --mpi_command argument --- scm/doc/TechGuide/chap_quick.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scm/doc/TechGuide/chap_quick.rst b/scm/doc/TechGuide/chap_quick.rst index df96e0f40..969c1e758 100644 --- a/scm/doc/TechGuide/chap_quick.rst +++ b/scm/doc/TechGuide/chap_quick.rst @@ -594,6 +594,12 @@ If using the main branch, you should run the above command to ensure you have th - Use this to specify the timestep to use (if different than the default specified in ``../src/suite_info.py``). +- ``--mpi_command`` + + - Provide argument to define the MPI command that will be invoked. + Default MPI command is ``mpirun -np 1``. + (Note: to run on a Derecho login node the empty argument ``--mpi_command ''`` is required.) + - ``--verbose [-v]`` - Use this option to see additional debugging output from the run @@ -876,7 +882,7 @@ Running the Docker image #. To run the SCM, you can run the Docker container that was just created and give it the same run commands as discussed in :numref:`Section %s ` - **Be sure to remember to include the ``-d`` and ``--mpi_command "mpirun -np 1 --allow-run-as-root"`` + **Be sure to remember to include the ``-d`` and ``--mpi_command "mpirun -np 1 --allow-run-as-root"`` options for all run commands**. For example, .. code:: bash From b044346c29a28e469acab2b51ffa5c9acf7bcb40 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Fri, 6 Sep 2024 14:03:31 -0600 Subject: [PATCH 13/21] Fix to Derecho script so it will run run_scm.py in the directory the batch script was called from --- scm/etc/scm_qsub_example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/etc/scm_qsub_example.py b/scm/etc/scm_qsub_example.py index e34d80ab4..70b3d82a4 100755 --- a/scm/etc/scm_qsub_example.py +++ b/scm/etc/scm_qsub_example.py @@ -34,7 +34,7 @@ WALLTIME = "walltime=00:20:00" PROCESSORS = "select=1:ncpus=1" QUEUE = "develop" -COMMAND = "./run_scm.py -c twpice" +COMMAND = "cd $PBS_O_WORKDIR; ./run_scm.py -c twpice" EMAIL_ADDR = MY_EMAIL SERIAL_MEM = "512M" WORKING_DIR = os.path.dirname(os.path.abspath(__file__)) From 8cb66031b17f7f99d27aea0a4d897e5d16f8b69e Mon Sep 17 00:00:00 2001 From: Tracy Date: Sat, 7 Sep 2024 00:17:39 +0000 Subject: [PATCH 14/21] additions to tutorial yaml --- environment-scm_analysis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environment-scm_analysis.yml b/environment-scm_analysis.yml index 298dbf072..b8ce5d17b 100644 --- a/environment-scm_analysis.yml +++ b/environment-scm_analysis.yml @@ -5,3 +5,5 @@ dependencies: - conda-forge::netcdf4 - conda-forge::f90nml - conda-forge::configobj + - conda-forge::matplotlib + - conda-forge::pandas From 311908934289e1606b1ab7b3b6fb4846b5559b6c Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 9 Sep 2024 11:02:01 -0400 Subject: [PATCH 15/21] change conversion_factors --- scm/etc/scripts/plot_configs/twpice_all_suites.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scm/etc/scripts/plot_configs/twpice_all_suites.ini b/scm/etc/scripts/plot_configs/twpice_all_suites.ini index 47cf2d1e5..f9a57798a 100644 --- a/scm/etc/scripts/plot_configs/twpice_all_suites.ini +++ b/scm/etc/scripts/plot_configs/twpice_all_suites.ini @@ -23,17 +23,19 @@ time_series_resample = True y_log = False y_min_option = min #min, max, val (if val, add y_min = float value) y_max_option = max #min, max, val (if val, add y_max = float value) - conversion_factor = 1000.0, 1000.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 + conversion_factor = 1000.0, 1000.0, 1.0, 86400.0, 86400.0, 86400.0, 86400.0, 86400.0 [[profiles_mean_multi]] [[[T_forcing]]] vars = T_force_tend, dT_dt_pbl, dT_dt_conv, dT_dt_micro, dT_dt_lwrad, dT_dt_swrad vars_labels = 'force', 'PBL', 'Conv', 'MP', 'LW', 'SW' x_label = 'K/day' + conversion_factor = 86400.0 [[[conv_tendencies]]] vars = dT_dt_deepconv, dT_dt_shalconv vars_labels = 'deep', 'shallow' x_label = 'K/day' + conversion_factor = 86400.0 [[profiles_instant]] From 5542079033609b4ff73c5ec361182f7e594fe6a4 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 9 Sep 2024 15:24:26 -0400 Subject: [PATCH 16/21] update contrib scripts to grab v7.0.0 release assets --- contrib/get_aerosol_climo.sh | 2 +- contrib/get_all_static_data.sh | 2 +- contrib/get_mg_inccn_data.sh | 2 +- contrib/get_thompson_tables.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/get_aerosol_climo.sh b/contrib/get_aerosol_climo.sh index 695d1c7a7..37f0a8cf2 100755 --- a/contrib/get_aerosol_climo.sh +++ b/contrib/get_aerosol_climo.sh @@ -20,7 +20,7 @@ data_files=("FV3_aeroclim1" "FV3_aeroclim2" "FV3_aeroclim3" "FV3_aeroclim_optics cd $BASEDIR/scm/data/physics_input_data/ for file in "${data_files[@]}"; do echo "Retrieving $file.tar.gz" - wget https://github.com/NCAR/ccpp-scm/releases/download/v7.0.0-beta/${file}.tar.gz + wget https://github.com/NCAR/ccpp-scm/releases/download/v7.0.0/${file}.tar.gz tar -xvf ${file}.tar.gz rm -f ${file}.tar.gz done diff --git a/contrib/get_all_static_data.sh b/contrib/get_all_static_data.sh index 99c0cd4de..b4b85e9f0 100755 --- a/contrib/get_all_static_data.sh +++ b/contrib/get_all_static_data.sh @@ -21,7 +21,7 @@ for file in "${data_files[@]}"; do mkdir -p $BASEDIR/scm/data/$file cd $BASEDIR/scm/data/$file echo "Retrieving $file" - wget https://github.com/NCAR/ccpp-scm/releases/download/v7.0.0-beta/${file}.tar.gz + wget https://github.com/NCAR/ccpp-scm/releases/download/v7.0.0/${file}.tar.gz tar -xf ${file}.tar.gz rm -f ${file}.tar.gz done diff --git a/contrib/get_mg_inccn_data.sh b/contrib/get_mg_inccn_data.sh index e98c277a8..b650ce338 100755 --- a/contrib/get_mg_inccn_data.sh +++ b/contrib/get_mg_inccn_data.sh @@ -16,7 +16,7 @@ BASEDIR=$MYDIR/.. # Change to directory containing the physics input data, download and extract archive cd $BASEDIR/scm/data/physics_input_data/ -wget https://github.com/NCAR/ccpp-scm/releases/download/v7.0.0-beta/MG_INCCN_data.tar.gz +wget https://github.com/NCAR/ccpp-scm/releases/download/v7.0.0/MG_INCCN_data.tar.gz tar -xvf MG_INCCN_data.tar.gz rm -f MG_INCCN_data.tar.gz cd $BASEDIR/ diff --git a/contrib/get_thompson_tables.sh b/contrib/get_thompson_tables.sh index 86a9487bc..6a192c4d0 100755 --- a/contrib/get_thompson_tables.sh +++ b/contrib/get_thompson_tables.sh @@ -15,7 +15,7 @@ BASEDIR=$MYDIR/.. # Change to directory containing the physics input data, download and extract archive cd $BASEDIR/scm/data/physics_input_data/ -wget https://github.com/NCAR/ccpp-scm/releases/download/v7.0.0-beta/thompson_tables.tar.gz +wget https://github.com/NCAR/ccpp-scm/releases/download/v7.0.0/thompson_tables.tar.gz tar -xvf thompson_tables.tar.gz rm -f thompson_tables.tar.gz cd $BASEDIR/ From d939f51fe8875192015fd0a0cfcf3c503cbb69e2 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Mon, 9 Sep 2024 14:10:39 -0600 Subject: [PATCH 17/21] Update Dockerfile to use release branch --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 97ced6d17..979781134 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -74,7 +74,7 @@ ENV w3emc_ROOT=/comsoftware/nceplibs # Obtain CCPP SCM source code, build code, and download static data RUN if [ -z "$PR_NUMBER" ]; then \ cd /comsoftware \ - && git clone --recursive -b main https://github.com/NCAR/ccpp-scm; \ + && git clone --recursive -b release/public-v7 https://github.com/NCAR/ccpp-scm; \ else \ cd /comsoftware \ && git clone https://github.com/NCAR/ccpp-scm \ From ed58eba1d4ed25d67a338ed60376c26b302f0a89 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 10 Oct 2024 17:08:39 -0400 Subject: [PATCH 18/21] use main branch of ccpp-framework --- .gitmodules | 2 +- ccpp/framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 56dee3ba7..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "ccpp-framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework - branch = develop + branch = main [submodule "ccpp-physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index af90b948b..0f8232724 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit af90b948b85b88649547b49d28ba98fd5cb8c4b1 +Subproject commit 0f8232724975c13289cad390c9a71fa2c6a9bff4 From 7f0ff6794286136573990e0828cb6e5afea3e55d Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 10 Oct 2024 17:10:04 -0400 Subject: [PATCH 19/21] use PR branch of ccpp/physics --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index dc0798c32..11096bf2d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/grantfirl/ccpp-physics + branch = ufs-dev-PR216 [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index da75531bf..fbd720d85 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit da75531bf90a799e4c0dcb988cc591d82bd024de +Subproject commit fbd720d858c78a8f57a5c6b1bdf25cc39884334e From ff1737f757c183bf78ea9b09635632451932e797 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 15 Oct 2024 18:47:32 -0400 Subject: [PATCH 20/21] add option in RT comparison script to turn off plots (only report differences via command line) --- test/cmp_rt2bl.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/test/cmp_rt2bl.py b/test/cmp_rt2bl.py index f29ed5218..7560d1b61 100755 --- a/test/cmp_rt2bl.py +++ b/test/cmp_rt2bl.py @@ -14,20 +14,22 @@ # parser = argparse.ArgumentParser() -parser.add_argument('-drt', '--dir_rt', help='Directory containing SCM RT output', required=True) -parser.add_argument('-dbl', '--dir_bl', help='Directory containing SCM RT baselines', required=True) +parser.add_argument('-drt', '--dir_rt', help='Directory containing SCM RT output', required=True) +parser.add_argument('-dbl', '--dir_bl', help='Directory containing SCM RT baselines', required=True) +parser.add_argument('-np', '--no_plots', help='flag to turn off generation of difference plots', required=False, action='store_true') # def parse_args(): args = parser.parse_args() dir_rt = args.dir_rt dir_bl = args.dir_bl - return (dir_rt, dir_bl) + no_plots = args.no_plots + return (dir_rt, dir_bl, no_plots) # def main(): # - (dir_rt, dir_bl) = parse_args() + (dir_rt, dir_bl, no_plots) = parse_args() # error_count = 0 @@ -38,14 +40,17 @@ def main(): com = "cmp "+file_rt+" "+file_bl+" > logfile.txt" result = os.system(com) if (result != 0): - print("Output for "+run["case"]+"_"+run["suite"]+ " DIFFERS from baseline. Difference plots will be created") + message = "Output for "+run["case"]+"_"+run["suite"]+ " DIFFERS from baseline." + if (not no_plots): + message += " Difference plots will be created." + print(message) error_count = error_count + 1 else: print("Output for "+run["case"]+"_"+run["suite"]+ " is IDENTICAL to baseline") # end if # Create plots between RTs and baselines (only if differences exist) - if (result != 0): + if (result != 0 and not no_plots): plot_files = plot_results(file_bl, file_rt) # Setup output directories for plots. @@ -71,7 +76,8 @@ def main(): # end for # Create tarball with plots. - result = os.system('tar -cvf scm_rt_out.tar scm_rt_out/*') + if (not no_plots): + result = os.system('tar -cvf scm_rt_out.tar scm_rt_out/*') # if error_count == 0: From 9352a5c49d617182ad24c7185b23a4af63b58276 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 21 Oct 2024 14:52:41 -0400 Subject: [PATCH 21/21] update ccpp/physics after merge --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 11096bf2d..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR216 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index fbd720d85..653db0a99 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit fbd720d858c78a8f57a5c6b1bdf25cc39884334e +Subproject commit 653db0a999cbb4aa2cb70f08cf4fcf1046438732