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.

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

DEPHY conversion #496

Merged
merged 31 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2c81c84
Update hera module for rocky8, remove shell setup scripts
Apr 4, 2024
9da57a8
update spack versio
Apr 9, 2024
936b893
add files for 2 MOSAiC cases from Amy Solomon
May 23, 2024
ce1c106
Merge branch 'NCAR:main' into add_MOSAic_case
hertneky May 23, 2024
1aed401
Merge branch 'main' into dephy_conversion
grantfirl Jul 9, 2024
dd673f2
add dephy_converter.py
grantfirl Jul 11, 2024
636450a
Merge branch 'main' into dephy_conversion
grantfirl Jul 18, 2024
19aea49
working version (at least for bomex)
grantfirl Jul 18, 2024
b25af21
only add vertical advective forcing if forc_w or forc_wap are not on
grantfirl Jul 19, 2024
cc937f5
add surface variables and updated case_config namelists
grantfirl Jul 24, 2024
298b59b
Merge branch 'main' into dephy_conversion
grantfirl Jul 30, 2024
3ba2954
add COMBLE case configuration and changes to scm_input.F90 to work wi…
grantfirl Jul 31, 2024
48d180e
Merge branch 'add_MOSAic_case' into dephy_conversion
grantfirl Jul 31, 2024
7eae638
update and convert MOSAiC cases to DEPHY format; allow both surfacefo…
grantfirl Aug 1, 2024
6e449c5
add new cases to rt_test_cases.py
grantfirl Aug 1, 2024
684448d
update get_all_static_data.sh script to grab v7.0.0-beta release asse…
grantfirl Aug 1, 2024
6fe54a5
Convert enormous regular string to multi-line f-string. This is much …
mkavulich Aug 9, 2024
18883a7
- Convert logging level to command-line argument
mkavulich Aug 9, 2024
7bbe0ce
Merge pull request #12 from mkavulich/dephy_conversion
grantfirl Aug 9, 2024
c6801d2
fix w_0/w_d bug caught by @mkavulich
grantfirl Aug 9, 2024
1d5c77f
Update scm/etc/scripts/dephy_converter.py
grantfirl Aug 9, 2024
f40427b
Update scm/etc/scripts/dephy_converter.py
grantfirl Aug 9, 2024
9a4c526
set default logging level to info
grantfirl Aug 10, 2024
11ad77b
Merge branch 'main' into dephy_conversion
grantfirl Aug 10, 2024
c5dc7b0
fix debug logging logic
grantfirl Aug 10, 2024
4b4cfd3
Update scm/etc/scripts/scm_analysis.py
grantfirl Aug 13, 2024
15bea31
Update scm/src/scm_input.F90
grantfirl Aug 13, 2024
9a842b9
Update scm/src/scm_input.F90
grantfirl Aug 13, 2024
dbce3ff
Update scm/src/scm_input.F90
grantfirl Aug 13, 2024
4e12394
fix indenting in scm_read_obs.py"
grantfirl Aug 13, 2024
4c9559c
fix COMBLE case namelist format
grantfirl Aug 13, 2024
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: 1 addition & 1 deletion contrib/get_all_static_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/v6.0.0/${file}.tar.gz
wget https://github.com/NCAR/ccpp-scm/releases/download/v7.0.0-beta/${file}.tar.gz
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mkavulich As soon as there is a v7.0.0-beta release on GitHub, this script is ready to go and CI should use the new files.

tar -xf ${file}.tar.gz
rm -f ${file}.tar.gz
done
Expand Down
9 changes: 9 additions & 0 deletions scm/etc/case_config/COMBLE.nml
grantfirl marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
$case_config
case_name = 'COMBLE',
input_type = 1
lsm_ics = .false.,
do_spinup = .false.,
spinup_timesteps = 0,
reference_profile_choice = 2,
column_area = 1.45E8,
$end
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_2016051812.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_2016051812',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2016,
month = 5,
day = 18,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_2016051812'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_2016051812_MSDA.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_2016051812_MSDA',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2016,
month = 5,
day = 18,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_2016051812_MSDA'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_2016051812_VARA.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_2016051812_VARA',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2016,
month = 5,
day = 18,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_2016051812_VARA'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180514_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180514_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 5,
day = 14,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180514_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180522_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180522_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 5,
day = 22,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180522_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180606_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180606_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 6,
day = 06,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180606_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180618_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180618_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 6,
day = 18,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180618_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180619_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180619_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 6,
day = 19,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180619_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180705_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180705_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 7,
day = 05,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180705_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180707_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180707_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 7,
day = 07,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180707_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180709_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180709_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 7,
day = 09,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180709_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180712_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180712_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 7,
day = 12,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180712_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180731_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180731_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 7,
day = 31,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180731_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180911_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180911_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 9,
day = 11,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180911_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
23 changes: 7 additions & 16 deletions scm/etc/case_config/LASSO_20180914_s02.nml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
$case_config
case_name = 'LASSO_20180914_s02',
runtime = 54000,
thermo_forcing_type = 2,
mom_forcing_type = 3,
relax_time = 7200.0,
sfc_flux_spec = .true.,
sfc_roughness_length_cm = 10.0
sfc_type = 1,
reference_profile_choice = 2,
year = 2018,
month = 9,
day = 14,
hour = 12,
column_area = 2.0E9,
$end
&case_config
case_name = 'LASSO_20180914_s02'
column_area = 2000000000.0
input_type = 1
reference_profile_choice = 2
sfc_roughness_length_cm = 10.0
/
Loading
Loading