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

Jump to bottom

Update mov run #994

Merged
merged 18 commits into from
Nov 30, 2023
Merged

Update mov run #994

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
14eacbe
update
lee1043 Oct 8, 2023
7c5c8f1
update
lee1043 Nov 2, 2023
fbe9ee5
Merge branch 'main' into update_mov_run
lee1043 Nov 2, 2023
5e29b8a
update
lee1043 Nov 2, 2023
b1706d0
Merge branch 'update_mov_run' of github.com:PCMDI/pcmdi_metrics into …
lee1043 Nov 2, 2023
3337626
update;
lee1043 Nov 2, 2023
6f05b68
pre-commit check
lee1043 Nov 2, 2023
75c54e1
keep shapely version to 2.0.1 because of python version limit for cdat
lee1043 Nov 3, 2023
edb61e2
Merge branch 'main' into update_mov_run
lee1043 Nov 23, 2023
ec4bb3d
add import shapely at the top and adjust isort setting thus pre-commi…
lee1043 Nov 29, 2023
327d169
use xarray data array to plot map with cartopy, and adjust 1e20 as na…
lee1043 Nov 30, 2023
cef14df
pre-commit test: style fix
lee1043 Nov 30, 2023
b36a5f0
clean up
lee1043 Nov 30, 2023
9bdba9d
clean up and bug fix
lee1043 Nov 30, 2023
8f7a10d
clean up
lee1043 Nov 30, 2023
77acd3d
clean up
lee1043 Nov 30, 2023
1baba96
clean up
lee1043 Nov 30, 2023
f1d711a
Merge branch 'main' into update_mov_run
lee1043 Nov 30, 2023
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
Next Next commit
update
  • Loading branch information
@lee1043
lee1043 committed Oct 8, 2023
commit 14eacbe866d74f41f4189b72d74a5094567377f8
6 changes: 3 additions & 3 deletions pcmdi_metrics/mjo/lib/post_process_plot_ensemble_mean.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@


def main():
mip = "cmip5"
# mip = 'cmip6'
# mip = "cmip5"
mip = 'cmip6'
exp = "historical"
version = "v20200807"
version = "v20230924"
period = "1985-2004"
datadir = (
"/p/user_pub/pmp/pmp_results/pmp_v1.1.2/diagnostic_results/mjo/"
Expand Down
6 changes: 4 additions & 2 deletions pcmdi_metrics/variability_mode/param/myParam_demo_NAM.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@
# -------------------------------------------------
reference_data_name = "NOAA-CIRES_20CR"
reference_data_path = os.path.join(
"/p/user_pub/PCMDIobs/PCMDIobs2/atmos/mon/psl/20CR/gn/v20200707",
"psl_mon_20CR_BE_gn_v20200707_187101-201212.nc",
"/p/user_pub/PCMDIobs/obs4MIPs/NOAA-ESRL-PSD/20CR/mon/psl/gn/latest",
"psl_mon_20CR_PCMDI_gn_187101-201212.nc"
#"/p/user_pub/PCMDIobs/PCMDIobs2/atmos/mon/psl/20CR/gn/v20200707",
#"psl_mon_20CR_BE_gn_v20200707_187101-201212.nc",
)

varOBS = "psl"
Expand Down
12 changes: 0 additions & 12 deletions pcmdi_metrics/variability_mode/scripts_pcmdi/run_pmp_parallel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export OMP_NUM_THREADS=1

ver=`date +"%Y%m%d-%H%M"`
case_id="v"`date +"%Y%m%d"`
case_id="v20210119"

#mips='cmip3 cmip5 cmip6'
#mips='cmip5 cmip6'
Expand All @@ -24,8 +23,6 @@ exps='historical'
#exps='amip'

#modes='all'
#modes='SAM'
#modes='SAM NAM'
modes='NAO NPO PNA'

modnames='all'
Expand All @@ -37,15 +34,6 @@ param_dir='../../../sample_setups/pcmdi_parameter_files/variability_modes'

for mip in $mips; do
echo $mip
#if [ $mip == 'cmip5' ]; then
# realization='r1i1p1'
# #modnames="BNU-ESM CESM1-FASTCHEM CMCC-CM FGOALS-g2 HadCM3 HadGEM2-CC IPSL-CM5A-LR IPSL-CM5A-MR MIROC4h MIROC5 MPI-ESM-LR MPI-ESM-MR"
# #modnames="HadGEM2-CC HadGEM2-ES INMCM4 IPSL-CM5A-LR IPSL-CM5A-MR IPSL-CM5B-LR MIROC-ESM MIROC-ESM-CHEM MIROC4h MIROC5 MPI-ESM-LR MPI-ESM-MR MPI-ESM-P MRI-CGCM3 MRI-ESM1 NorESM1-M NorESM1-ME"
#fi
if [ $mip == 'cmip6' ]; then
# realization='r1i1p1f1'
modnames="CNRM-CM6-1-HR EC-Earth3 EC-Earth3-AerChem EC-Earth3-Veg HadGEM3-GC31-MM"
fi
for exp in $exps; do
if [ $modes == 'all' ]; then
if [ $exp == 'historical' ] || [ $exp == '20c3m' ]; then
Expand Down