Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
helix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Andreas Korpi-Lagg
helix
Commits
6af9ca58
Commit
6af9ca58
authored
1 year ago
by
Andreas Korpi-Lagg
Browse files
Options
Downloads
Patches
Plain Diff
some mac compilation issues
parent
ecdeeb77
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
idlpro/call_cp.pro
+0
-1
0 additions, 1 deletion
idlpro/call_cp.pro
idlpro/helix.pro
+1
-2
1 addition, 2 deletions
idlpro/helix.pro
scripts/compile_mac
+12
-5
12 additions, 5 deletions
scripts/compile_mac
with
13 additions
and
8 deletions
idlpro/call_cp.pro
+
0
−
1
View file @
6af9ca58
...
@@ -11,7 +11,6 @@ function call_cp,ipt=ipt,line=line,atm=atm,obs_par=obs_par, $
...
@@ -11,7 +11,6 @@ function call_cp,ipt=ipt,line=line,atm=atm,obs_par=obs_par, $
@
common_maxpar
@
common_maxpar
if
n_elements
(
idlso_dir
)
eq
0
then
idlso_dir
=
'./idl.so/'
if
n_elements
(
idlso_dir
)
eq
0
then
idlso_dir
=
'./idl.so/'
if
n_elements
(
comp
)
eq
0
then
comp
=-
1
if
n_elements
(
comp
)
eq
0
then
comp
=-
1
...
...
This diff is collapsed.
Click to expand it.
idlpro/helix.pro
+
1
−
2
View file @
6af9ca58
...
@@ -118,7 +118,7 @@ pro helix,ifile,ipt=input_file,list=plist,savall=savall, $
...
@@ -118,7 +118,7 @@ pro helix,ifile,ipt=input_file,list=plist,savall=savall, $
ipt
=
read_ipt
(
struct
=
struct_ipt
,
parin
=
parin
)
ipt
=
read_ipt
(
struct
=
struct_ipt
,
parin
=
parin
)
struct_mode
=
1
struct_mode
=
1
endelse
endelse
;
reading
input
atmosphere
(
ATM_INPUT
keyword
)
;
reading
input
atmosphere
(
ATM_INPUT
keyword
)
read_atminput
read_atminput
...
@@ -925,7 +925,6 @@ pro helix,ifile,ipt=input_file,list=plist,savall=savall, $
...
@@ -925,7 +925,6 @@ pro helix,ifile,ipt=input_file,list=plist,savall=savall, $
endif
endif
endif
endif
endfor
endfor
;
initialize
call
to
compute_profile
;
initialize
call
to
compute_profile
if
ipt
.
code
eq
'IDL'
then
begin
if
ipt
.
code
eq
'IDL'
then
begin
fill_localstray
,
lsi
,
lsq
,
lsu
,
lsv
,
dols
,
$
fill_localstray
,
lsi
,
lsq
,
lsu
,
lsv
,
dols
,
$
...
...
This diff is collapsed.
Click to expand it.
scripts/compile_mac
+
12
−
5
View file @
6af9ca58
#!/bin/bash
#!/bin/bash
#compile on ubuntu linux machines
#compile on ubuntu linux machines
echo
"There is currently no support for Apple Silicon. Solution: Compile it on an intel mac, the binaries can be used also on a Silicon Mac."
git pull
git pull
autoconf
autoconf
#FC=gfortran
FC
=
gfortran
FC
=
ifort
#FC=ifort
#cfitsio=./cfitsio
cfitsio
=
/opt/homebrew/
cfitsio
=
/opt/homebrew/
cfitsio
=
./cfitsio
dislin
=
/usr/local/dislin
#dislin=
#create ifort version with X11
#create ifort version with X11
./configure
FC
=
gfortran
--with-dislin
=
/usr/local/
dislin
--with-cfitsio
=
$cfitsio
./configure
FC
=
gfortran
--with-dislin
=
$
dislin
--with-cfitsio
=
$cfitsio
make clean all
install
make clean all
install
[
$?
!=
0
]
&&
{
echo
"Compilation failed. Exit."
;
exit
;
}
[
$?
!=
0
]
&&
{
echo
"Compilation failed. Exit."
;
exit
;
}
#create gfortran version with X11
#create gfortran version with X11
./configure
FC
=
gfortran
--with-dislin
=
/usr/local/
dislin
--with-cfitsio
=
$cfitsio
./configure
FC
=
gfortran
--with-dislin
=
$
dislin
--with-cfitsio
=
$cfitsio
make clean all
install
make clean all
install
[
$?
!=
0
]
&&
{
echo
"Compilation failed. Exit."
;
exit
;
}
[
$?
!=
0
]
&&
{
echo
"Compilation failed. Exit."
;
exit
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment