Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
CrysFML
Commits
b9e56341
Commit
b9e56341
authored
Feb 10, 2022
by
juan rodriguez-carvajal
Browse files
Starting to prepare fpm in Linux
parent
57606bc0
Pipeline
#12454
failed with stages
in 6 minutes and 8 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Program_Examples/Structures_GlobalOptimization/Src/GLOpSAnn.f90
View file @
b9e56341
...
...
@@ -881,12 +881,11 @@ Subroutine Write_FST(fst_file,v,cost)
character
(
len
=
132
)
::
file_fst
,
fst_cmd
character
(
len
=
30
),
dimension
(
10
)
::
cmds
if
(
v
(
1
)
==
1.234567
)
write
(
*
,
"(a)"
)
" => This is nothing!"
if
(
v
(
1
)
==
1.234567
.and.
cost
==
v
(
2
)
)
write
(
*
,
"(a)"
)
" => This is nothing!
To avoid warnings in compilation
"
i
=
index
(
fst_file
,
".fst"
)
file_fst
=
fst_file
(
1
:
i
+3
)
fst_cmd
=
adjustl
(
fst_file
(
i
+4
:))
nc
=
0
if
(
cost
<
-1.0e30
)
write
(
unit
=*
,
fmt
=
"(a)"
,
advance
=
"no"
)
"?"
!Just to avoid warning
do
i
=
index
(
fst_cmd
,
";"
)
if
(
i
/
=
0
)
then
...
...
Src/tochange.sh
View file @
b9e56341
#!/bin/bash
#
if
[
-z
"
$1
"
]
;
then
cat
<<
!
Syntax : tochange.sh xxx or tochange.sh f90
!
exit
fi
#
# Arguments
#
for
arg
in
"
$@
"
do
case
"
$arg
"
in
"xxx"
)
to_change
=
$arg
;;
"f90"
)
to_change
=
$arg
;;
esac
done
if
[
$to_change
==
"xxx"
]
;
then
echo
"---- Changing the extension of some *.f90 files to *.xxx to maintain compatibility with FPM"
mv
CFML_Export_Vtk_LF95.f90 CFML_Export_Vtk_LF95.xxx
mv
CFML_FlipR_Mod.f90 CFML_FlipR_Mod.xxx
mv
CFML_GlobalDeps_Linux.f90 CFML_GlobalDeps_Linux.xxx
mv
CFML_GlobalDeps_Linux_Intel.f90 CFML_GlobalDeps_Linux_Intel.xxx
mv
CFML_GlobalDeps_MacOS.f90 CFML_GlobalDeps_MacOS.xxx
mv
CFML_GlobalDeps_MacOS_Intel.f90 CFML_GlobalDeps_MacOS_Intel.xxx
mv
CFML_GlobalDeps_Windows_gfortran.f90 CFML_GlobalDeps_Windows_gfortran.xxx
mv
CFML_GlobalDeps_Windows_Intel.f90 CFML_GlobalDeps_Windows_Intel.xxx
mv
CFML_GlobalDeps_Windows_Intel64.f90 CFML_GlobalDeps_Windows_Intel64.xxx
mv
CFML_HDF5.f90 CFML_HDF5.xxx
mv
CFML_ILL_Instrm_Data_LF.f90 CFML_ILL_Instrm_Data_LF.xxx
mv
CFML_IO_MessagesRW.f90 CFML_IO_MessagesRW.xxx
mv
CFML_IO_MessagesWin.f90 CFML_IO_MessagesWin.xxx
mv
CFML_String_Utilities_gf.f90 CFML_String_Utilities_gf.xxx
mv
CFML_String_Utilities_LF.f90 CFML_String_Utilities_LF.xxx
mv
f2kcli.f90 f2kcli.xxx
exit
fi
if
[
$to_change
==
"f90"
]
;
then
echo
"---- Changing the extension of *.xxx files to *.f90 to maintain compatibility with CMake"
mv
CFML_Export_Vtk_LF95.xxx CFML_Export_Vtk_LF95.f90
mv
CFML_FlipR_Mod.xxx CFML_FlipR_Mod.f90
mv
CFML_GlobalDeps_Linux.xxx CFML_GlobalDeps_Linux.f90
mv
CFML_GlobalDeps_Linux_Intel.xxx CFML_GlobalDeps_Linux_Intel.f90
mv
CFML_GlobalDeps_MacOS.xxx CFML_GlobalDeps_MacOS.f90
mv
CFML_GlobalDeps_MacOS_Intel.xxx CFML_GlobalDeps_MacOS_Intel.f90
mv
CFML_GlobalDeps_Windows_gfortran.xxx CFML_GlobalDeps_Windows_gfortran.f90
mv
CFML_GlobalDeps_Windows_Intel.xxx CFML_GlobalDeps_Windows_Intel.f90
mv
CFML_GlobalDeps_Windows_Intel64.xxx CFML_GlobalDeps_Windows_Intel64.f90
mv
CFML_HDF5.xxx CFML_HDF5.f90
mv
CFML_ILL_Instrm_Data_LF.xxx CFML_ILL_Instrm_Data_LF.f90
mv
CFML_IO_MessagesRW.xxx CFML_IO_MessagesRW.f90
mv
CFML_IO_MessagesWin.xxx CFML_IO_MessagesWin.f90
mv
CFML_String_Utilities_gf.xxx CFML_String_Utilities_gf.f90
mv
CFML_String_Utilities_LF.xxx CFML_String_Utilities_LF.f90
mv
f2kcli.xxx f2kcli.f90
exit
else
echo
"---- NOTHING DONE! This script should be invoked with argument xxx or f90 !"
fi
#!/bin/bash
#
if
[
-z
"
$1
"
]
;
then
cat
<<
!
Syntax : tochange.sh xxx or tochange.sh f90
or tochange.sh xxx win or tochange.sh f90 win
!
exit
fi
#
# Arguments
#
win
=
"N"
to_change
=
"xxx"
for
arg
in
"
$@
"
do
case
"
$arg
"
in
"xxx"
)
to_change
=
$arg
;;
"f90"
)
to_change
=
$arg
;;
"win"
)
win
=
$arg
;;
esac
done
if
[
$to_change
==
"xxx"
]
;
then
echo
"---- Changing the extension of some *.f90 files to *.xxx to maintain compatibility with FPM"
mv
CFML_Export_Vtk_LF95.f90 CFML_Export_Vtk_LF95.xxx
mv
CFML_FlipR_Mod.f90 CFML_FlipR_Mod.xxx
mv
CFML_GlobalDeps_Linux.f90 CFML_GlobalDeps_Linux.xxx
mv
CFML_GlobalDeps_Linux_Intel.f90 CFML_GlobalDeps_Linux_Intel.xxx
mv
CFML_GlobalDeps_MacOS.f90 CFML_GlobalDeps_MacOS.xxx
mv
CFML_GlobalDeps_MacOS_Intel.f90 CFML_GlobalDeps_MacOS_Intel.xxx
mv
CFML_GlobalDeps_Windows_gfortran.f90 CFML_GlobalDeps_Windows_gfortran.xxx
mv
CFML_GlobalDeps_Windows_Intel.f90 CFML_GlobalDeps_Windows_Intel.xxx
mv
CFML_HDF5.f90 CFML_HDF5.xxx
mv
CFML_ILL_Instrm_Data_LF.f90 CFML_ILL_Instrm_Data_LF.xxx
mv
CFML_IO_MessagesRW.f90 CFML_IO_MessagesRW.xxx
if
[
$win
==
"win"
]
;
then
mv
CFML_IO_Messages.f90 CFML_IO_Messages.xxx
mv
CFML_IO_MessagesWin.f90 CFML_IO_Messages.f90
else
mv
CFML_IO_MessagesWin.f90 CFML_IO_MessagesWin.xxx
fi
mv
CFML_String_Utilities_gf.f90 CFML_String_Utilities_gf.xxx
mv
CFML_String_Utilities_LF.f90 CFML_String_Utilities_LF.xxx
mv
f2kcli.f90 f2kcli.xxx
exit
fi
if
[
$to_change
==
"f90"
]
;
then
echo
"---- Changing the extension of *.xxx files to *.f90 to maintain compatibility with CMake"
mv
CFML_Export_Vtk_LF95.xxx CFML_Export_Vtk_LF95.f90
mv
CFML_FlipR_Mod.xxx CFML_FlipR_Mod.f90
mv
CFML_GlobalDeps_Linux.xxx CFML_GlobalDeps_Linux.f90
mv
CFML_GlobalDeps_Linux_Intel.xxx CFML_GlobalDeps_Linux_Intel.f90
mv
CFML_GlobalDeps_MacOS.xxx CFML_GlobalDeps_MacOS.f90
mv
CFML_GlobalDeps_MacOS_Intel.xxx CFML_GlobalDeps_MacOS_Intel.f90
mv
CFML_GlobalDeps_Windows_gfortran.xxx CFML_GlobalDeps_Windows_gfortran.f90
mv
CFML_GlobalDeps_Windows_Intel.xxx CFML_GlobalDeps_Windows_Intel.f90
mv
CFML_HDF5.xxx CFML_HDF5.f90
mv
CFML_ILL_Instrm_Data_LF.xxx CFML_ILL_Instrm_Data_LF.f90
mv
CFML_IO_MessagesRW.xxx CFML_IO_MessagesRW.f90
mv
CFML_IO_MessagesWin.xxx CFML_IO_MessagesWin.f90
if
[
$win
==
"win"
]
;
then
mv
CFML_IO_Messages.f90 CFML_IO_MessagesWin.f90
mv
CFML_IO_Messages.xxx CFML_IO_Messages.f90
else
mv
CFML_IO_MessagesWin.f90 CFML_IO_MessagesWin.xxx
fi
mv
CFML_String_Utilities_gf.xxx CFML_String_Utilities_gf.f90
mv
CFML_String_Utilities_LF.xxx CFML_String_Utilities_LF.f90
mv
f2kcli.xxx f2kcli.f90
exit
else
echo
"---- NOTHING DONE! This script should be invoked with argument xxx or f90 and optionally a second argument win!"
fi
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment