Merge pull request #307 from grantfirl/update_vgrid

Update scm_vgrid and UI
NCAR · Apr 11, 2022 · 548a2fa · 548a2fa
2 parents 8574f5b + 23875a0
commit 548a2fa
Show file tree

Hide file tree

Showing 72 changed files with 2,679 additions and 2,182 deletions.
diff --git a/scm/etc/CENTOS_docker_setup.sh b/scm/etc/CENTOS_docker_setup.sh
@@ -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

diff --git a/scm/etc/Cheyenne_setup_gnu.csh b/scm/etc/Cheyenne_setup_gnu.csh
@@ -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

diff --git a/scm/etc/Cheyenne_setup_gnu.sh b/scm/etc/Cheyenne_setup_gnu.sh
@@ -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

diff --git a/scm/etc/Cheyenne_setup_intel.csh b/scm/etc/Cheyenne_setup_intel.csh
@@ -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

diff --git a/scm/etc/Cheyenne_setup_intel.sh b/scm/etc/Cheyenne_setup_intel.sh
@@ -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
@@ -53,4 +55,3 @@ if [ $? -ne 0 ]; then
 else
         echo "f90nml is installed"
 fi
-
diff --git a/scm/etc/Desktop_setup_gfortran.csh b/scm/etc/Desktop_setup_gfortran.csh
@@ -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

diff --git a/scm/etc/Desktop_setup_gfortran.sh b/scm/etc/Desktop_setup_gfortran.sh
@@ -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

diff --git a/scm/etc/Hera_setup_intel.csh b/scm/etc/Hera_setup_intel.csh
@@ -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

diff --git a/scm/etc/Hera_setup_intel.sh b/scm/etc/Hera_setup_intel.sh
@@ -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

diff --git a/scm/etc/case_config/AMMA_REF.nml b/scm/etc/case_config/AMMA_REF.nml
@@ -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
diff --git a/scm/etc/case_config/ARMCU_E3SM.nml b/scm/etc/case_config/ARMCU_E3SM.nml
@@ -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,

diff --git a/scm/etc/case_config/ARMCU_MESONH.nml b/scm/etc/case_config/ARMCU_MESONH.nml
@@ -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,

diff --git a/scm/etc/case_config/ARMCU_REF.nml b/scm/etc/case_config/ARMCU_REF.nml
@@ -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
diff --git a/scm/etc/case_config/AYOTTE_00SC.nml b/scm/etc/case_config/AYOTTE_00SC.nml
@@ -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,

diff --git a/scm/etc/case_config/BOMEX_REF.nml b/scm/etc/case_config/BOMEX_REF.nml
@@ -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,

diff --git a/scm/etc/case_config/DYNAMO_NSA3a.nml b/scm/etc/case_config/DYNAMO_NSA3a.nml
@@ -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,

diff --git a/scm/etc/case_config/DYNAMO_NSA3a_D1.nml b/scm/etc/case_config/DYNAMO_NSA3a_D1.nml
@@ -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,

diff --git a/scm/etc/case_config/GABLS1_REF.nml b/scm/etc/case_config/GABLS1_REF.nml
@@ -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,

diff --git a/scm/etc/case_config/IHOP_REF.nml b/scm/etc/case_config/IHOP_REF.nml
@@ -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,

diff --git a/scm/etc/case_config/LASSO_2016051812.nml b/scm/etc/case_config/LASSO_2016051812.nml
@@ -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,

diff --git a/scm/etc/case_config/LASSO_2016051812_MSDA.nml b/scm/etc/case_config/LASSO_2016051812_MSDA.nml
@@ -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,

diff --git a/scm/etc/case_config/LASSO_2016051812_VARA.nml b/scm/etc/case_config/LASSO_2016051812_VARA.nml
@@ -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,

diff --git a/scm/etc/case_config/LASSO_20180514_s02.nml b/scm/etc/case_config/LASSO_20180514_s02.nml
@@ -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,

diff --git a/scm/etc/case_config/LASSO_20180522_s02.nml b/scm/etc/case_config/LASSO_20180522_s02.nml
@@ -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,

diff --git a/scm/etc/case_config/LASSO_20180606_s02.nml b/scm/etc/case_config/LASSO_20180606_s02.nml
@@ -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,

diff --git a/scm/etc/case_config/LASSO_20180618_s02.nml b/scm/etc/case_config/LASSO_20180618_s02.nml
@@ -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,

diff --git a/scm/etc/case_config/LASSO_20180619_s02.nml b/scm/etc/case_config/LASSO_20180619_s02.nml
@@ -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,