Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@
[submodule "ece2cmor3/resources/cmip7-cmor-tables"]
path = ece2cmor3/resources/cmip7-cmor-tables
url = https://github.com/WCRP-CMIP/cmip7-cmor-tables.git
[submodule "ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CVs"]
path = ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CVs
url = https://github.com/WCRP-CMIP/CMIP6Plus_CVs.git
[submodule "ece2cmor3/resources/cmip6plus-tables/mip-cmor-tables"]
path = ece2cmor3/resources/cmip6plus-tables/mip-cmor-tables
url = https://github.com/PCMDI/mip-cmor-tables.git
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CV.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/CMIP6Plus_CVs
Submodule CMIP6Plus_CVs added at c3b18c
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_ACmon.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_ACmonZ.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AE1hr.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AE3hrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AE3hrPtLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AE6hr.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AE6hrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AE6hrPtLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AEday.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AEmon.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AEmonLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AEmonZ.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AEsubhrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AP1hr.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AP1hrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AP3hr.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AP3hrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AP3hrPtLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AP6hr.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPtLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_AP6hrPtZ.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APday.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APdayLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APdayZ.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APfx.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APmon.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APmonClim.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APmonClimLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APmonDiurnal.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APmonLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APmonZ.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APsubhrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_APsubhrPtLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_GIAfx.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_GIAmon.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_GIAyr.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_GIGfx.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_GIGmon.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_GIGyr.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LI3hrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LI6hrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LIday.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LIfx.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LImon.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LP3hr.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LP3hrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LP6hrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LPday.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LPfx.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LPmon.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LPyr.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_LPyrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OBday.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OBmon.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OBmonLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OByr.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OByrLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OP3hrPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPday.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPdec.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPdecLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPdecZ.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPfx.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPmon.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPmonClim.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPmonClimLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPmonLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPmonZ.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPyr.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_OPyrLev.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_SIday.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_SImon.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_SImonPt.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_coordinate.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/MIP_grids.json
1 change: 1 addition & 0 deletions ece2cmor3/resources/cmip6plus-tables/mip-cmor-tables
Submodule mip-cmor-tables added at e5bac7
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
MIP=CMIP
EXPERIMENT_NAME=esm-hist

TABLEDIR=/home/nktr/cmorize/cmip6plus-tables
TABLEDIR=../../resources/cmip6plus-tables/
TABLEPREFIX=MIP

ECEDIR=${SCRATCH}/${ece_branch_root_dir}/$EXPID/output/$COMPONENT/$LEG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
MIP=TIPMIP
EXPERIMENT_NAME=esm-up2p0-gwl2p0

TABLEDIR=../../resources/cmip6plus-tables/
TABLEPREFIX=MIP

ECEDIR=${SCRATCH}/${ece_branch_root_dir}/$EXP/output/$COMPONENT/$LEG
METADATA=${PWD}/../../resources/metadata-templates/cmip6Plus-${MIP}-metadata-$COMPONENT-template.json
TEMPDIR=${SCRATCH}/temp-cmor-dir/$EXP/$COMPONENT/$LEG
Expand All @@ -58,18 +61,18 @@
export UVCDAT_ANONYMOUS_LOG=false
#export ECE2CMOR3_IFS_CLEANUP=FALSE

ece2cmor $ECEDIR --exp $EXP \
--ececonf $ECEMODEL \
--$COMPONENT \
--meta $METADATA \
--varlist $VARLIST \
--tabledir /home/nktr/cmorize/cmip6plus-tables \
--tableprefix MIP \
--tmpdir $TEMPDIR \
--odir $ODIR \
--npp $NPP \
--overwritemode replace \
--skip_alevel_vars \
ece2cmor $ECEDIR --exp $EXP \
--ececonf $ECEMODEL \
--$COMPONENT \
--meta $METADATA \
--varlist $VARLIST \
--tabledir $TABLEDIR \
--tableprefix $TABLEPREFIX \
--tmpdir $TEMPDIR \
--odir $ODIR \
--npp $NPP \
--overwritemode replace \
--skip_alevel_vars \
--log

if [ "$COMPONENT" = "nemo" ]; then
Expand Down
4 changes: 4 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# pytest.ini
[pytest]
testpaths =
test
Loading