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

Rename Data directory to data for fv3jedi test case #281

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
+95 −95
Open

Rename Data directory to data for fv3jedi test case #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
692691a
Change Data to data for fv3jedi test case
SamuelDegelia-NOAA Feb 13, 2025
4661000
Fix crtm data path
SamuelDegelia-NOAA Feb 14, 2025
8966325
Fix plotting scripts to use data instead of Data
SamuelDegelia-NOAA Feb 14, 2025
b722745
Merge branch 'develop' into feature/rename_fv3data
SamuelDegelia-NOAA Feb 14, 2025
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
0 fix/expr_data/fv3_2024052700/Data/bkg → fix/expr_data/fv3_2024052700/data/bkg
View file
Open in desktop
File renamed without changes.
0 fix/expr_data/fv3_2024052700/Data/crtm → fix/expr_data/fv3_2024052700/data/crtm
View file
Open in desktop
File renamed without changes.
0 ...pr_data/fv3_2024052700/Data/fieldmetadata → ...pr_data/fv3_2024052700/data/fieldmetadata
View file
Open in desktop
File renamed without changes.
0 fix/expr_data/fv3_2024052700/Data/geovals → fix/expr_data/fv3_2024052700/data/geovals
View file
Open in desktop
File renamed without changes.
0 fix/expr_data/fv3_2024052700/Data/inputs → fix/expr_data/fv3_2024052700/data/inputs
View file
Open in desktop
File renamed without changes.
0 fix/expr_data/fv3_2024052700/Data/obs → fix/expr_data/fv3_2024052700/data/obs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion rrfs-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if(FV3_DYCORE)
file(CREATE_LINK ${src_casedir}/DataFix ${casedir}/DataFix SYMBOLIC)
file(CREATE_LINK ${src_casedir}/Data_static ${casedir}/Data_static SYMBOLIC)
file(CREATE_LINK ${src_casedir}/INPUT ${casedir}/INPUT SYMBOLIC)
file(CREATE_LINK ${src_casedir}/Data ${casedir}/Data SYMBOLIC)
file(CREATE_LINK ${src_casedir}/data ${casedir}/data SYMBOLIC)
file(CREATE_LINK ${CMAKE_SOURCE_DIR}/rrfs-test/testoutput ${casedir}/testoutput SYMBOLIC)
file(COPY ${src_yaml}/${case}.yaml DESTINATION ${casedir} )
set(target_test ${case})
Expand Down
2 changes: 1 addition & 1 deletion rrfs-test/scripts/link_fv3jedi_expr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ sed -e "s#@RDASApp@#${RDASApp}#" ${RDASApp}/rrfs-test/scripts/templates/fv3jedi_
cp ${RDASApp}/rrfs-test/ush/colormap.py .
cp ${RDASApp}/rrfs-test/ush/fv3jedi_increment_singleob.py .
cp ${RDASApp}/rrfs-test/ush/fv3jedi_increment_fulldom.py .
ln -snf ${RDASApp}/fix/expr_data/${exprname}/Data Data
ln -snf ${RDASApp}/fix/expr_data/${exprname}/data data
ln -snf ${RDASApp}/fix/expr_data/${exprname}/DataFix DataFix
ln -snf ${RDASApp}/fix/expr_data/${exprname}/Data_static Data_static
ln -snf ${RDASApp}/fix/expr_data/${exprname}/INPUT INPUT
56 changes: 28 additions & 28 deletions rrfs-test/testinput/rrfs_fv3jedi_2024052700_Ens3Dvar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cost function:
namelist filename: DataFix/fmsmpp.nml
field table filename: DataFix/field_table
namelist filename: DataFix/input_lam_C775_NP16X10.nml
field metadata override: Data/fieldmetadata/tlei-gfs-restart.yaml
field metadata override: data/fieldmetadata/tlei-gfs-restart.yaml
akbk: DataFix/fix/akbk66.nc
# input.nml
npz: 65
Expand All @@ -22,7 +22,7 @@ cost function:
background:
datetime: &analysisDate 2024-05-27T00:00:00Z
filetype: fms restart
datapath: Data/bkg
datapath: data/bkg
filename_core: 20240527.000000.fv_core.res.tile1.nc
filename_trcr: 20240527.000000.fv_tracer.res.tile1.nc
filename_sfcd: 20240527.000000.sfc_data.nc
Expand All @@ -36,7 +36,7 @@ cost function:
datetime: 2024-05-27T00:00:00Z
filetype: fms restart
state variables: *3dvars
datapath: Data/inputs/mem%mem%/
datapath: data/inputs/mem%mem%/
filename_core: 20240527.000000.fv_core.res.tile1.nc
filename_trcr: 20240527.000000.fv_tracer.res.tile1.nc
filename_sfcd: 20240527.000000.sfc_data.nc
Expand Down Expand Up @@ -68,7 +68,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircar_dc.nc"
obsfile: "data/obs/ioda_aircar_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -222,7 +222,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircar_dc.nc"
obsfile: "data/obs/ioda_aircar_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -457,7 +457,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircar_dc.nc"
obsfile: "data/obs/ioda_aircar_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -623,7 +623,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircft_dc.nc"
obsfile: "data/obs/ioda_aircft_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -777,7 +777,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircft_dc.nc"
obsfile: "data/obs/ioda_aircft_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -931,7 +931,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircft_dc.nc"
obsfile: "data/obs/ioda_aircft_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -1085,7 +1085,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircft_dc.nc"
obsfile: "data/obs/ioda_aircft_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -1239,7 +1239,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircft_dc.nc"
obsfile: "data/obs/ioda_aircft_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -1405,7 +1405,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircft_dc.nc"
obsfile: "data/obs/ioda_aircft_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -1640,7 +1640,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircft_dc.nc"
obsfile: "data/obs/ioda_aircft_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -1875,7 +1875,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircft_dc.nc"
obsfile: "data/obs/ioda_aircft_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -2110,7 +2110,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_aircft_dc.nc"
obsfile: "data/obs/ioda_aircft_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -2345,7 +2345,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_msonet_dc.nc"
obsfile: "data/obs/ioda_msonet_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -2494,7 +2494,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_msonet_dc.nc"
obsfile: "data/obs/ioda_msonet_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -2644,7 +2644,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_msonet_dc.nc"
obsfile: "data/obs/ioda_msonet_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -2791,7 +2791,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/ioda_msonet_dc.nc"
obsfile: "data/obs/ioda_msonet_dc.nc"
obsdataout:
engine:
type: H5File
Expand Down Expand Up @@ -3015,7 +3015,7 @@ cost function:
obsdatain:
engine:
type: H5File
obsfile: "Data/obs/atms_npp_obs_2024052700_dc.nc"
obsfile: "data/obs/atms_npp_obs_2024052700_dc.nc"
obsdataout:
engine:
type: H5File
Expand All @@ -3030,7 +3030,7 @@ cost function:
obs options:
Sensor_ID: atms_npp
EndianType: little_endian
CoefficientPath: Data/crtm/
CoefficientPath: data/crtm/
IRVISlandCoeff: IGBP
linear obs operator:
Absorbers: [H2O, O3]
Expand All @@ -3039,14 +3039,14 @@ cost function:
lengthscale: 300e3 # orig

obs bias:
input file: Data/obs/atms_npp.satbias.nc4
input file: data/obs/atms_npp.satbias.nc4
output file: ./out_atms_npp.satbias.nc
variational bc:
predictors:
- name: constant
- name: lapseRate
order: 2
tlapse: &atms_npp_tlapse Data/obs/atms_npp.tlapse.txt
tlapse: &atms_npp_tlapse data/obs/atms_npp.tlapse.txt
- name: lapseRate
tlapse: *atms_npp_tlapse
- name: emissivityJacobian
Expand All @@ -3063,7 +3063,7 @@ cost function:
step size: 1.0e-4
largest analysis variance: 10000.0
prior:
input file: Data/obs/atms_npp.satbias_cov.nc4
input file: data/obs/atms_npp.satbias_cov.nc4
inflation:
ratio: 1.1
ratio for small dataset: 2.0
Expand Down Expand Up @@ -3603,9 +3603,9 @@ variational:
geometry:
fms initialization:
namelist filename: DataFix/fmsmpp.nml
field table filename: DataFix/field_table
field table filename: dataFix/field_table
namelist filename: DataFix/input_lam_C775_NP16X10.nml
field metadata override: Data/fieldmetadata/tlei-gfs-restart.yaml
field metadata override: data/fieldmetadata/tlei-gfs-restart.yaml
akbk: DataFix/fix/akbk66.nc
# input.nml
npz: 65
Expand All @@ -3619,9 +3619,9 @@ variational:
geometry:
fms initialization:
namelist filename: DataFix/fmsmpp.nml
field table filename: DataFix/field_table
field table filename: dataFix/field_table
namelist filename: DataFix/input_lam_C775_NP16X10.nml
field metadata override: Data/fieldmetadata/tlei-gfs-restart.yaml
field metadata override: data/fieldmetadata/tlei-gfs-restart.yaml
akbk: DataFix/fix/akbk66.nc
# input.nml
npz: 65
Expand Down
4 changes: 2 additions & 2 deletions rrfs-test/testinput/rrfs_fv3jedi_2024052700_bumploc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ geometry:
field table filename: DataFix/field_table
namelist filename: DataFix/input_lam_C775_NP16X10.nml
akbk: DataFix/fix/akbk66.nc
field metadata override: Data/fieldmetadata/tlei-gfs-restart.yaml
field metadata override: data/fieldmetadata/tlei-gfs-restart.yaml
# input.nml
npz: 65
layout: [16,10]
Expand All @@ -13,7 +13,7 @@ geometry:
background:
datetime: 2024-05-27T00:00:00Z
filetype: fms restart
datapath: Data/bkg
datapath: data/bkg
filename_core: 20240527.000000.fv_core.res.tile1.nc
filename_trcr: 20240527.000000.fv_tracer.res.tile1.nc
filename_sfcd: 20240527.000000.sfc_data.nc
Expand Down
Loading