Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
brivas
ICOADS R HOSTACE
Commits
ad457e0a
Commit
ad457e0a
authored
3 years ago
by
Richard Cornes
Browse files
Options
Download
Email Patches
Plain Diff
Fixed bug in reading ICOADS .Rda files
parent
cb4791d3
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
261 additions
and
256 deletions
+261
-256
rscripts/process_ships.R
rscripts/process_ships.R
+1
-1
rscripts/split_by_type.R
rscripts/split_by_type.R
+241
-237
scr/NOC/config.yml
scr/NOC/config.yml
+10
-9
scr/NOC/run_start.csh
scr/NOC/run_start.csh
+6
-6
scr/NOC/setup_icproc
scr/NOC/setup_icproc
+3
-3
No files found.
rscripts/process_ships.R
View file @
ad457e0a
...
...
@@ -30,7 +30,7 @@ drop<-c("wmi","is","es","rs","ir","rrr","qci","mds","osz","oov","ooz","opv",
"oav"
,
"oaz"
,
"wx"
,
"sx"
,
"eoh"
,
"hop"
,
"smf"
,
"sme"
,
"smv"
)
#call.dcks <-c(128,233,254,255,555,700,708,709,732,735,749,781,792,849,874,875,888,889,892,926,927,992,993,995,999)
if
(
!
dir.exists
(
paste0
(
config
$
output_dir
,
"MFILES_SHIP_PROC"
)))
dir.create
(
paste0
(
config
$
output_dir
,
"MFILES_SHIP_PROC"
))
if
(
!
dir.exists
(
paste0
(
config
$
output_dir
,
"MFILES_SHIP_PROC"
)))
dir.create
(
paste0
(
config
$
output_dir
,
"MFILES_SHIP_PROC"
)
,
recursive
=
TRUE
)
options
(
warn
=
1
)
if
(
length
(
my_args
)
<
2
)
{
my_args
<-
my_args2
}
...
...
This diff is collapsed.
Click to expand it.
rscripts/split_by_type.R
View file @
ad457e0a
This diff is collapsed.
Click to expand it.
scr/NOC/config.yml
View file @
ad457e0a
...
...
@@ -27,23 +27,24 @@ default:
#output_dir: "../output_data/"
# The next paths are need in icoads.utils::get_pub47() for log output
output_dir_pub47_txt
:
"
/noc/mpoc/surface_data/ICOADS_R
3_PROC
/HOSTACE_PROC_ANC_INFO/"
output_dir
:
"
/noc/mpoc/surface_data/ICOADS_R
3_PROC/RUN_ZERO
/output_data/"
output_dir_pub47_txt
:
"
/noc/mpoc/surface_data/ICOADS_R
UN_TEST
/HOSTACE_PROC_ANC_INFO/"
output_dir
:
"
/noc/mpoc/surface_data/ICOADS_R
UN_TEST
/output_data/"
profiler_output
:
"
"
# setup for GIULIA's tracking
track_code_dir
:
"
/noc/users/metman/GIULIA_TRACK_CODE/TRACK_CODE_FROM_JASMIN/"
track_root_athena
:
"
/pgdata/metman/TRACK"
track_input
:
"
/noc/mpoc/surface_data/ICOADS_R
3_PROC
/RUN_ZERO/output_data/TRACK_INPUT/"
track_output
:
"
/noc/mpoc/surface_data/ICOADS_R
3_PROC
/RUN_ZERO/output_data/GTRACK_OUT/"
track_input
:
"
/noc/mpoc/surface_data/ICOADS_R
UN_TEST
/RUN_ZERO/output_data/TRACK_INPUT/"
track_output
:
"
/noc/mpoc/surface_data/ICOADS_R
UN_TEST
/RUN_ZERO/output_data/GTRACK_OUT/"
# Final Processing Dirs
data_dir
:
"
/noc/mpoc/surface_data/ICOADS_R
3_PROC
/RUN_ZERO/output_data/FINAL_PROC"
data_dir
:
"
/noc/mpoc/surface_data/ICOADS_R
UN_TEST
/RUN_ZERO/output_data/FINAL_PROC"
# Height Files/Dirs
ens_hts_dir
:
"
/noc/mpoc/surface_data/ICOADS_R
3_PROC
/RUN_ZERO/output_data/ENS_HTS/"
ens_grid_hts_dir
:
"
/noc/mpoc/surface_data/ICOADS_R
3_PROC
/RUN_ZERO/output_data/GRID_HTS/"
def_hts_file
:
"
/noc/mpoc/surface_data/ICOADS_R
3_PROC
/RUN_ZERO/output_data/default_height_ensemble.Rda"
ens_hts_dir
:
"
/noc/mpoc/surface_data/ICOADS_R
UN_TEST
/RUN_ZERO/output_data/ENS_HTS/"
ens_grid_hts_dir
:
"
/noc/mpoc/surface_data/ICOADS_R
UN_TEST
/RUN_ZERO/output_data/GRID_HTS/"
def_hts_file
:
"
/noc/mpoc/surface_data/ICOADS_R
UN_TEST
/RUN_ZERO/output_data/default_height_ensemble.Rda"
# Diurnal dirs
dir_flags_dir
:
"
/noc/mpoc/surface_data/ICOADS_R3_PROC/RUN_ZERO/output_data/DIURNAL_FAIL_IDS/"
\ No newline at end of file
dir_flags_dir
:
"
/noc/mpoc/surface_data/ICOADS_RUN_TEST/RUN_ZERO/output_data/DIURNAL_FAIL_IDS/"
\ No newline at end of file
This diff is collapsed.
Click to expand it.
scr/NOC/run_start.csh
View file @
ad457e0a
#!/bin/csh
#!/bin/csh
# Immediately exit a script when it encounters an error
#set -e
...
...
@@ -9,7 +9,7 @@
# Load required modules and set base/code directories
source setup_icproc
if ( ! -d ${basedir}OPFILES ) then
#echo Exists
#else
...
...
@@ -29,10 +29,10 @@ echo "logfile" ${log_output_dir}/op.$1.$2
#echo "removing existing files" >> ${log_output_dir}/op.$1
#Rscript $codedir/remove_output_files.R $1 >> ${log_output_dir}/op.$1
if ( $3 == "remove" ) then
echo "removing existing files" >> ${log_output_dir}/op.$1.$2
Rscript $codedir/remove_output_files.R $1 $2 >> ${log_output_dir}/op.$1.$2
else
echo "not removing existing files" >> ${log_output_dir}/op.$1.$2
echo "removing existing files" >> ${log_output_dir}/op.$1.$2
Rscript $codedir/remove_output_files.R $1 $2 >> ${log_output_dir}/op.$1.$2
else
echo "not removing existing files" >> ${log_output_dir}/op.$1.$2
endif
echo 'running start of processing' >> ${log_output_dir}/op.$1.$2
...
...
This diff is collapsed.
Click to expand it.
scr/NOC/setup_icproc
100644 → 100755
View file @
ad457e0a
#!/bin/csh
#conda activate ~/miniconda3/envs/r_env
module load R
module load R
/3.5.1
module load gdal
module load geos
module load nco
...
...
@@ -9,6 +9,6 @@ module load netcdf
module load intel_compiler
module load gcc/7.2
set basedir="/noc/mpoc/surface_data/ICOADS_R
3_PROC/RUN_ZERO
/"
set codedir="/noc/users/
eck/nocgit
/icoads-r-hostace/rscripts/"
set basedir="/noc/mpoc/surface_data/ICOADS_R
UN_TEST
/"
set codedir="/noc/users/
ricorne
/icoads-r-hostace/rscripts/"
set configfile="config.yml"
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment