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

Update scm_vgrid and UI #307

Merged
merged 9 commits into from
Apr 11, 2022
Merged

Update scm_vgrid and UI #307

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f0bc9dd
update scm_vgrid from fv_eta
grantfirl Mar 5, 2022
58f7504
working updated version of run_scm.py (without using suite_info); sti…
grantfirl Mar 9, 2022
c42f7f1
use suite_info in run_scm.py
grantfirl Mar 9, 2022
1b306f8
edit all case configuration files to have only necessary case-specifi…
grantfirl Mar 10, 2022
6fb6675
update machine setup script to set the SCM_ROOT environment variable …
grantfirl Mar 10, 2022
ebdd79f
fix bug in run_scm.py
grantfirl Mar 10, 2022
a43a3fa
Merge branch 'main' into update_vgrid
grantfirl Mar 14, 2022
f7bc834
address reviewer comments
grantfirl Mar 31, 2022
3e5acf5
fix tab error introduced in last commit in suite_info.py
grantfirl Apr 11, 2022
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: 2 additions & 0 deletions scm/etc/CENTOS_docker_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

echo "Setting environment variables for SCM-CCPP on CENTOS with gcc/gfortran"

export SCM_ROOT=$PWD

export CC=/opt/rh/devtoolset-9/root/usr/bin/gcc
export CXX=/opt/rh/devtoolset-9/root/usr/bin/g++
export F77=/opt/rh/devtoolset-9/root/usr/bin/gfortran
Expand Down
2 changes: 2 additions & 0 deletions scm/etc/Cheyenne_setup_gnu.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

echo "Setting environment variables for CCPP-SCM on Cheyenne with gcc/gfortran"

setenv SCM_ROOT $PWD

#start with a "clean" environment; activate and deactivate ncar_pylib in order to successfully deactivate previously activated environment without errors
module load ncarenv/1.3
ncar_pylib
Expand Down
2 changes: 2 additions & 0 deletions scm/etc/Cheyenne_setup_gnu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

echo "Setting environment variables for CCPP-SCM on Cheyenne with gcc/gfortran"

export SCM_ROOT=$PWD

#start with a "clean" environment; activate and deactivate ncar_pylib in order to successfully deactivate previously activated environment without errors
module load ncarenv/1.3
ncar_pylib
Expand Down
2 changes: 2 additions & 0 deletions scm/etc/Cheyenne_setup_intel.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

echo "Setting environment variables for CCPP-SCM on Cheyenne with icc/ifort"

setenv SCM_ROOT $PWD

#start with a "clean" environment; activate and deactivate ncar_pylib in order to successfully deactivate previously activated environment without errors
module load ncarenv/1.3
ncar_pylib
Expand Down
3 changes: 2 additions & 1 deletion scm/etc/Cheyenne_setup_intel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

echo "Setting environment variables for CCPP-SCM on Cheyenne with icc/ifort"

export SCM_ROOT=$PWD

#start with a "clean" environment; activate and deactivate ncar_pylib in order to successfully deactivate previously activated environment without errors
module load ncarenv/1.3
ncar_pylib
Expand Down Expand Up @@ -53,4 +55,3 @@ if [ $? -ne 0 ]; then
else
echo "f90nml is installed"
fi

2 changes: 2 additions & 0 deletions scm/etc/Desktop_setup_gfortran.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

echo "Setting environment variables for CCPP-SCM on Desktop (MacOS) with gcc/gfortran"

setenv SCM_ROOT $PWD

echo "Setting CC/CXX/FC environment variables"
setenv CC /opt/local/bin/gcc-mp-10
setenv CXX /opt/local/bin/g++-mp-10
Expand Down
2 changes: 2 additions & 0 deletions scm/etc/Desktop_setup_gfortran.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

echo "Setting environment variables for CCPP-SCM on Desktop (MacOS) with gcc/gfortran"

export SCM_ROOT=$PWD

echo "Setting CC/CXX/FC environment variables"
export CC=/opt/local/bin/gcc-mp-10
export CXX=/opt/local/bin/g++-mp-10
Expand Down
2 changes: 2 additions & 0 deletions scm/etc/Hera_setup_intel.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

echo "Setting environment variables for CCPP-SCM on Hera with icc/ifort"

setenv SCM_ROOT $PWD

#load the modules in order to compile the CCPP SCM
echo "Loading intel and netcdf modules..."
module purge
Expand Down
2 changes: 2 additions & 0 deletions scm/etc/Hera_setup_intel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

echo "Setting environment variables for CCPP-SCM on Hera with icc/ifort"

export SCM_ROOT=$PWD

#load the modules in order to compile the CCPP SCM
echo "Loading intel and netcdf modules..."
module purge
Expand Down
11 changes: 0 additions & 11 deletions scm/etc/case_config/AMMA_REF.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'AMMA_REF',
input_type = 1
dt = 600.0,
time_scheme = 1,
n_itt_out = 1,
n_itt_diag = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/DEPHY-SCM/AMMA/REF',
vert_coord_data_dir = '../data/vert_coord_data',
lsm_ics = .false.,
do_spinup = .false.,
spinup_timesteps = 0,
reference_profile_choice = 2,
reference_profile_dir = '../data/processed_case_input'
column_area = 1.45E8,
$end
10 changes: 0 additions & 10 deletions scm/etc/case_config/ARMCU_E3SM.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'ARMCU_E3SM',
input_type = 1
dt = 600.0,
time_scheme = 1,
n_itt_out = 1,
n_itt_diag = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/DEPHY-SCM/ARMCU/E3SM',
vert_coord_data_dir = '../data/vert_coord_data',
lsm_ics = .false.,
do_spinup = .false.,
spinup_timesteps = 0,
Expand Down
10 changes: 0 additions & 10 deletions scm/etc/case_config/ARMCU_MESONH.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'ARMCU_MESONH',
input_type = 1
dt = 600.0,
time_scheme = 1,
n_itt_out = 1,
n_itt_diag = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/DEPHY-SCM/ARMCU/MESONH',
vert_coord_data_dir = '../data/vert_coord_data',
lsm_ics = .false.,
do_spinup = .false.,
spinup_timesteps = 0,
Expand Down
11 changes: 0 additions & 11 deletions scm/etc/case_config/ARMCU_REF.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'ARMCU_REF',
input_type = 1
dt = 600.0,
time_scheme = 1,
n_itt_out = 1,
n_itt_diag = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/DEPHY-SCM/ARMCU/REF',
vert_coord_data_dir = '../data/vert_coord_data',
lsm_ics = .false.,
do_spinup = .false.,
spinup_timesteps = 0,
reference_profile_choice = 2,
reference_profile_dir = '../data/processed_case_input'
column_area = 1.45E8,
$end
10 changes: 0 additions & 10 deletions scm/etc/case_config/AYOTTE_00SC.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'AYOTTE_00SC',
input_type = 1
dt = 600.0,
time_scheme = 1,
n_itt_out = 1,
n_itt_diag = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/DEPHY-SCM/AYOTTE/00SC',
vert_coord_data_dir = '../data/vert_coord_data',
lsm_ics = .false.,
do_spinup = .false.,
spinup_timesteps = 0,
Expand Down
10 changes: 0 additions & 10 deletions scm/etc/case_config/BOMEX_REF.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'BOMEX_REF',
input_type = 1
dt = 600.0,
time_scheme = 1,
n_itt_out = 1,
n_itt_diag = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/DEPHY-SCM/BOMEX/REF',
vert_coord_data_dir = '../data/vert_coord_data',
lsm_ics = .false.,
do_spinup = .false.,
spinup_timesteps = 0,
Expand Down
10 changes: 0 additions & 10 deletions scm/etc/case_config/DYNAMO_NSA3a.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'DYNAMO_NSA3a',
input_type = 1
dt = 600.0,
time_scheme = 1,
n_itt_out = 1,
n_itt_diag = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/DEPHY-SCM/DYNAMO/NSA3a',
vert_coord_data_dir = '../data/vert_coord_data',
lsm_ics = .false.,
do_spinup = .false.,
spinup_timesteps = 0,
Expand Down
10 changes: 0 additions & 10 deletions scm/etc/case_config/DYNAMO_NSA3a_D1.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'DYNAMO_NSA3a_D1',
input_type = 1
dt = 600.0,
time_scheme = 1,
n_itt_out = 1,
n_itt_diag = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/DEPHY-SCM/DYNAMO/NSA3a_D1',
vert_coord_data_dir = '../data/vert_coord_data',
lsm_ics = .false.,
do_spinup = .false.,
spinup_timesteps = 0,
Expand Down
10 changes: 0 additions & 10 deletions scm/etc/case_config/GABLS1_REF.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'GABLS1_REF',
input_type = 1
dt = 600.0,
time_scheme = 1,
n_itt_out = 1,
n_itt_diag = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/DEPHY-SCM/GABLS1/REF',
vert_coord_data_dir = '../data/vert_coord_data',
lsm_ics = .false.,
do_spinup = .false.,
spinup_timesteps = 0,
Expand Down
10 changes: 0 additions & 10 deletions scm/etc/case_config/IHOP_REF.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'IHOP_REF',
input_type = 1
dt = 600.0,
time_scheme = 1,
n_itt_out = 1,
n_itt_diag = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/DEPHY-SCM/IHOP/REF',
vert_coord_data_dir = '../data/vert_coord_data',
lsm_ics = .false.,
do_spinup = .false.,
spinup_timesteps = 0,
Expand Down
9 changes: 0 additions & 9 deletions scm/etc/case_config/LASSO_2016051812.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'LASSO_2016051812',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
vert_coord_data_dir = '../data/vert_coord_data',
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
Expand Down
9 changes: 0 additions & 9 deletions scm/etc/case_config/LASSO_2016051812_MSDA.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'LASSO_2016051812_MSDA',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
vert_coord_data_dir = '../data/vert_coord_data',
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
Expand Down
9 changes: 0 additions & 9 deletions scm/etc/case_config/LASSO_2016051812_VARA.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'LASSO_2016051812_VARA',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
vert_coord_data_dir = '../data/vert_coord_data',
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
Expand Down
9 changes: 0 additions & 9 deletions scm/etc/case_config/LASSO_20180514_s02.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'LASSO_20180514_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
vert_coord_data_dir = '../data/vert_coord_data',
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
Expand Down
9 changes: 0 additions & 9 deletions scm/etc/case_config/LASSO_20180522_s02.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'LASSO_20180522_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
vert_coord_data_dir = '../data/vert_coord_data',
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
Expand Down
9 changes: 0 additions & 9 deletions scm/etc/case_config/LASSO_20180606_s02.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'LASSO_20180606_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
vert_coord_data_dir = '../data/vert_coord_data',
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
Expand Down
9 changes: 0 additions & 9 deletions scm/etc/case_config/LASSO_20180618_s02.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'LASSO_20180618_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
vert_coord_data_dir = '../data/vert_coord_data',
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
Expand Down
9 changes: 0 additions & 9 deletions scm/etc/case_config/LASSO_20180619_s02.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
$case_config
model_name = 'FV3',
n_columns = 1,
case_name = 'LASSO_20180619_s02',
dt = 600.0,
time_scheme = 1,
runtime = 54000,
n_itt_out = 1,
n_levels = 64,
output_file = 'output',
case_data_dir = '../data/processed_case_input',
vert_coord_data_dir = '../data/vert_coord_data',
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
Expand Down
Loading