[cig-commits] [commit] Hiro_latest: Add valuable for GNU make (9e9499b)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Nov 18 16:21:36 PST 2013
Repository : ssh://geoshell/calypso
On branch : Hiro_latest
Link : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce
>---------------------------------------------------------------
commit 9e9499b3f9b42864c200b263a4c8b1e6085c1577
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Sat Nov 9 07:28:05 2013 -0800
Add valuable for GNU make
>---------------------------------------------------------------
9e9499b3f9b42864c200b263a4c8b1e6085c1577
Makefile.in | 1 +
src/External_libs/Makefile | 30 +++++++---
src/Fortran_libraries/MHD_src/Makefile | 15 +++--
src/Fortran_libraries/Makefile | 23 +++++---
src/Fortran_libraries/PARALLEL_src/Makefile | 15 +++--
src/Fortran_libraries/SERIAL_src/Makefile | 15 +++--
src/Fortran_libraries/SOLVER_src/Makefile | 15 +++--
src/Fortran_libraries/UTILS_src/Makefile | 21 ++++---
src/Makefile | 46 ++++++++++-----
src/programs/Makefile | 21 ++++---
src/programs/SPH_MHD/control_MHD | 68 +++++++++++++++++++---
.../data_utilities/MERGE/control_assemble_sph | 8 ++-
src/programs/data_utilities/Makefile | 21 ++++---
13 files changed, 219 insertions(+), 80 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index a568f56..7972fb1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,6 +69,7 @@ makemake: $(MAKE_MOD_DEP)
echo "# Construct Makefile"; \
cd $(MHDDIR) ; \
$(GMAKE) \
+ GMAKE="$(GMAKE)" \
MAKEDIR="$(MAKEDIR)" \
BUILDDIR="$(BUILDDIR)" \
INSTDIR="$(INSTDIR)" \
diff --git a/src/External_libs/Makefile b/src/External_libs/Makefile
index 736f691..1caf9b7 100644
--- a/src/External_libs/Makefile
+++ b/src/External_libs/Makefile
@@ -15,9 +15,11 @@ dir_list:
( \
echo 'generate diectory list for ' $$dir ; \
cd $${dir}; \
- make dir_list \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKEDIR='$(MAKEDIR)' \
MAKENAME='$(MAKENAME)' \
+ dir_list; \
) \
done
@echo '#' >> $(MAKENAME)
@@ -27,9 +29,11 @@ lib_name:
( \
echo 'generate library list for ' $$dir ; \
cd $${dir}; \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKEDIR='$(MAKEDIR)' \
MAKENAME='$(MAKENAME)' \
- make lib_name; \
+ lib_name; \
) \
done
@@ -37,10 +41,12 @@ lib_tasks:
@for dir in $(SUBDIRS) ; do \
( cd $${dir}; \
echo 'generate library commands for ' $$dir ; \
- make lib_tasks \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
OPENGL_LIBS='$(OPENGL_LIBS)' \
MAKEDIR='$(MAKEDIR)' \
- MAKENAME='$(MAKENAME)'; \
+ MAKENAME='$(MAKENAME)' \
+ lib_tasks; \
) \
done
@@ -48,7 +54,8 @@ lib_tasks:
mod_list:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
mod_list \
) \
@@ -60,10 +67,12 @@ module:
( \
echo 'generate compile commands for ' $$dir ; \
cd $${dir}; \
- make module \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKEDIR='$(MAKEDIR)' \
MAKENAME='$(MAKENAME)' \
- MAKE_MOD_DEP='$(MAKE_MOD_DEP)' ;\
+ MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \
+ module; \
) \
done
@@ -72,8 +81,10 @@ includes:
( \
echo 'copy C include files for ' $$dir ; \
cd $${dir}; \
- make includes \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
+ includes; \
) \
done
@@ -81,7 +92,8 @@ includes:
clean:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
clean \
) \
done
diff --git a/src/Fortran_libraries/MHD_src/Makefile b/src/Fortran_libraries/MHD_src/Makefile
index e1a3666..de4a2f2 100644
--- a/src/Fortran_libraries/MHD_src/Makefile
+++ b/src/Fortran_libraries/MHD_src/Makefile
@@ -21,7 +21,8 @@ dir_list:
@echo '#' >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
dir_list \
) \
@@ -43,7 +44,8 @@ libtarget:
lib_archve:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
lib_archve \
) \
@@ -58,7 +60,8 @@ mod_list:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
mod_list; \
) \
@@ -68,7 +71,8 @@ mod_list:
module:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \
MAKENAME='$(MAKENAME)' \
module; \
@@ -79,7 +83,8 @@ module:
clean:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
clean \
) \
done
diff --git a/src/Fortran_libraries/Makefile b/src/Fortran_libraries/Makefile
index 8f52785..5c51a67 100644
--- a/src/Fortran_libraries/Makefile
+++ b/src/Fortran_libraries/Makefile
@@ -26,9 +26,11 @@ dir_list:
( \
echo 'generate diectory list for ' $$dir ; \
cd $${dir}; \
- make dir_list \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKEDIR='$(MAKEDIR)' \
MAKENAME='$(MAKENAME)' \
+ dir_list; \
) \
done
@echo '#' >> $(MAKENAME)
@@ -42,9 +44,11 @@ lib_name:
( \
echo 'generate library list for ' $$dir ; \
cd $${dir}; \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKEDIR='$(MAKEDIR)' \
MAKENAME='$(MAKENAME)' \
- make lib_name; \
+ lib_name; \
) \
done
@@ -52,7 +56,8 @@ lib_tasks: libtarget lib_archve
@echo ' ''$$(RANLIB) $$@' >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
lib_tasks \
) \
@@ -65,7 +70,8 @@ libtarget:
lib_archve:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
lib_archve \
) \
@@ -80,7 +86,8 @@ mod_list:
@echo >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
mod_list; \
) \
@@ -90,7 +97,8 @@ mod_list:
module:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \
MAKENAME='$(MAKENAME)' \
module; \
@@ -103,7 +111,8 @@ includes:
clean:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
clean \
) \
done
diff --git a/src/Fortran_libraries/PARALLEL_src/Makefile b/src/Fortran_libraries/PARALLEL_src/Makefile
index 47396af..f2e2d2e 100644
--- a/src/Fortran_libraries/PARALLEL_src/Makefile
+++ b/src/Fortran_libraries/PARALLEL_src/Makefile
@@ -20,7 +20,8 @@ dir_list:
@echo '#' >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
dir_list; \
) \
@@ -42,7 +43,8 @@ libtarget:
lib_archve:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
lib_archve \
) \
@@ -57,7 +59,8 @@ mod_list:
'$$(MOD_ITP_PARA)' >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
mod_list; \
) \
@@ -67,7 +70,8 @@ mod_list:
module:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \
MAKENAME='$(MAKENAME)' \
module; \
@@ -78,7 +82,8 @@ module:
clean:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
clean \
) \
done
diff --git a/src/Fortran_libraries/SERIAL_src/Makefile b/src/Fortran_libraries/SERIAL_src/Makefile
index 67f4618..4efab96 100644
--- a/src/Fortran_libraries/SERIAL_src/Makefile
+++ b/src/Fortran_libraries/SERIAL_src/Makefile
@@ -25,7 +25,8 @@ dir_list:
@echo '#' >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
dir_list; \
) \
@@ -47,7 +48,8 @@ libtarget:
lib_archve:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
lib_archve; \
) \
@@ -66,7 +68,8 @@ mod_list:
@echo >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
mod_list; \
) \
@@ -76,7 +79,8 @@ mod_list:
module:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \
MAKENAME='$(MAKENAME)' \
module; \
@@ -87,7 +91,8 @@ module:
clean:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
clean \
) \
done
diff --git a/src/Fortran_libraries/SOLVER_src/Makefile b/src/Fortran_libraries/SOLVER_src/Makefile
index d192856..0ba8fc8 100644
--- a/src/Fortran_libraries/SOLVER_src/Makefile
+++ b/src/Fortran_libraries/SOLVER_src/Makefile
@@ -21,7 +21,8 @@ dir_list:
( \
echo 'generate diectory list for ' $$dir ; \
cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
dir_list; \
) \
@@ -43,7 +44,8 @@ libtarget:
lib_archve:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
lib_archve; \
) \
@@ -58,7 +60,8 @@ mod_list:
'$$(MOD_SOLVER_LU)' >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
mod_list; \
) \
@@ -68,7 +71,8 @@ module:
@echo '' >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \
MAKENAME='$(MAKENAME)' \
module; \
@@ -79,7 +83,8 @@ module:
clean:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
clean \
) \
done
diff --git a/src/Fortran_libraries/UTILS_src/Makefile b/src/Fortran_libraries/UTILS_src/Makefile
index 7cf1671..b77cdb1 100644
--- a/src/Fortran_libraries/UTILS_src/Makefile
+++ b/src/Fortran_libraries/UTILS_src/Makefile
@@ -24,7 +24,8 @@ dir_list:
( \
echo 'generate diectory list for ' $$dir ; \
cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
dir_list \
) \
@@ -37,9 +38,11 @@ lib_name:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
echo 'generate library list for ' $$dir ; \
- make lib_name \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKEDIR='$(MAKEDIR)' \
- MAKENAME='$(MAKENAME)'; \
+ MAKENAME='$(MAKENAME)' \
+ lib_name; \
) \
done
@@ -54,7 +57,8 @@ libtarget:
lib_archve:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
lib_archve; \
) \
@@ -71,7 +75,8 @@ mod_list:
@echo '' >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
mod_list; \
) \
@@ -82,7 +87,8 @@ module:
@echo '' >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \
MAKENAME='$(MAKENAME)' \
module; \
@@ -93,7 +99,8 @@ module:
clean:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
clean \
) \
done
diff --git a/src/Makefile b/src/Makefile
index 940f8d9..53709ef 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -70,7 +70,9 @@ all: fluid
fluid:
echo "# Compiling start"; \
cd work; \
- make fluid
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
+ fluid
makemake:
@@ -140,9 +142,11 @@ makemake:
( \
echo 'generate diectory list for ' $$dir ; \
cd $${dir}; \
- make dir_list \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKEDIR='$(MAKEDIR)' \
MAKENAME='$(MAKENAME)' \
+ dir_list; \
) \
done
@echo '#' >> $(MAKENAME)
@@ -160,9 +164,11 @@ makemake:
( \
echo 'generate target list for ' $$dir ; \
cd $${dir}; \
- make target_list \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
BUILDDIR='$(BUILDDIR)' \
- MAKENAME='$(MAKENAME)'; \
+ MAKENAME='$(MAKENAME)' \
+ target_list; \
) \
done
@echo '#' >> $(MAKENAME)
@@ -175,9 +181,11 @@ makemake:
( \
echo 'generate library list for ' $$dir ; \
cd $${dir}; \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKEDIR='$(MAKEDIR)' \
MAKENAME='$(MAKENAME)' \
- make lib_name; \
+ lib_name; \
) \
done
@echo '#' >> $(MAKENAME)
@@ -188,10 +196,12 @@ makemake:
@echo 'create object module list...'
@for dir in $(SUBDIRS) ; do \
( cd $${dir}; \
- make mod_list \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
FFTW3_LIBS='$(FFTW3_LIBS)' \
MAKEDIR='$(MAKEDIR)' \
- MAKENAME='$(MAKENAME)'; \
+ MAKENAME='$(MAKENAME)' \
+ mod_list; \
) \
done
@echo '' >> $(MAKENAME)
@@ -200,7 +210,8 @@ makemake:
@echo 'all: $$(PROGRAMS)' >> $(MAKENAME)
@for dir in programs ; do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
target_task \
) \
@@ -213,9 +224,11 @@ makemake:
@echo '' >> $(MAKENAME)
@for dir in $(SUBDIRS) ; do \
( cd $${dir}; \
- make lib_tasks \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKEDIR='$(MAKEDIR)' \
- MAKENAME='$(MAKENAME)'; \
+ MAKENAME='$(MAKENAME)' \
+ lib_tasks; \
) \
done
@echo '' >> $(MAKENAME)
@@ -227,9 +240,11 @@ makemake:
( \
echo 'generate compile commands for ' $$dir ; \
cd $${dir}; \
- make module \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKEDIR='$(MAKEDIR)' \
- MAKENAME='$(MAKENAME)'; \
+ MAKENAME='$(MAKENAME)' \
+ module; \
) \
done
@echo '' >> $(MAKENAME)
@@ -319,7 +334,12 @@ install:
mkdir $$(INSTDIR)/include; \
fi
@for dir in geoutil solver MHD surface marge_fluid; do \
- (cd $${dir}; make INSTDIR=$$(INSTDIR) RANLIB=$(RANLIB) install) \
+ (cd $${dir}; \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
+ INSTDIR=$$(INSTDIR) RANLIB=$(RANLIB) \
+ install; \
+ ) \
done
clean:
diff --git a/src/programs/Makefile b/src/programs/Makefile
index 2a26a03..c09c2bd 100644
--- a/src/programs/Makefile
+++ b/src/programs/Makefile
@@ -29,7 +29,8 @@ dir_list:
( \
echo 'generate diectory list for ' $$dir ; \
cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
dir_list \
) \
@@ -39,7 +40,8 @@ dir_list:
target_list:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
BUILDDIR='$(BUILDDIR)' \
MAKENAME='$(MAKENAME)' \
target_list \
@@ -54,7 +56,8 @@ target_task:
@echo '' >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
target_task \
) \
@@ -70,7 +73,8 @@ lib_name:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
echo 'generate library list for ' $$dir ; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
lib_name \
) \
@@ -82,7 +86,8 @@ lib_tasks:
mod_list:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
mod_list \
) \
@@ -92,7 +97,8 @@ mod_list:
module:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKE_MOD_DEP='$(MAKE_MOD_DEP)' \
MAKENAME='$(MAKENAME)' \
module; \
@@ -105,7 +111,8 @@ includes:
clean:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
clean \
) \
done
diff --git a/src/programs/SPH_MHD/control_MHD b/src/programs/SPH_MHD/control_MHD
index a9515c1..de136b1 100644
--- a/src/programs/SPH_MHD/control_MHD
+++ b/src/programs/SPH_MHD/control_MHD
@@ -4,18 +4,17 @@ begin MHD_control
! num_subdomain_ctl: number of subdomains
! num_smp_ctl: number of smp processes
!
-! sph_file_prefix: prefix of mode file (Default: in.domain#)
-!
+! sph_file_prefix: prefix of mesh file (Default: in.domain#)
! restart_file_prefix: prefix of restart file
! (Default: restart/rst.step#.domain#)
!
-! field_file_prefix: prefix for snapshot field data
+! field_file_prefix: prefix of snapshot field data
! (Default: out.step#.domain#.udt)
!
! mesh_file_fmt_ctl: data format for mesh file
! restart_file_fmt_ctl: data format for restart files
! field_file_fmt_ctl: data format for field files
-! ('VTK, merged_VTK, merged_HDF5')
+! (ascii or binary, Dafault is 'ascii')
!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
@@ -24,14 +23,16 @@ begin MHD_control
num_smp_ctl 4
!
sph_file_prefix 'sph_grid/in'
+!
coriolis_int_file_name 'sph_shell/rot_int.dat'
+ boundary_data_file_name 'bc_spec.dat'
!
restart_file_prefix 'restart/rst'
field_file_prefix 'field/out'
!
mesh_file_fmt_ctl 'ascii'
sph_file_fmt_ctl 'ascii'
- restart_file_fmt_ctl 'ascii'
+ restart_file_fmt_ctl 'ascii'
field_file_fmt_ctl 'ascii'
coriolis_file_fmt_ctl 'ascii'
end data_files_def
@@ -41,16 +42,55 @@ begin MHD_control
! available valuables
! velocity, temperature, pressure, vorticity
! vector_potential, magnetic_field, current_density, magnetic_potential
+! electric_field, poynting_flux
! composition, perturbation_temp
!
+! filter_velo, filter_temp, filter_part_temp
+! filter_vecp, filter_magne
+!
+! kinetic_helicity, magnetic_helicity
+! current_helicity, cross_helicity
+!
! buoyancy_flux, Lorentz_work, mag_tension_work
-! magnetic_ene_generation
+! magnetic_ene_generation, work_against_Lorentz
! temp_generation, part_temp_gen
! vis_ene_diffuse, mag_ene_diffuse
!
-! thermal_diffusion, viscous_diffusion, magnetic_diffusion
+! thermal_diffusion, viscous_diffusion
+! diffuse_vector_p, magnetic_diffusion
+! magnetic_tension, Lorentz_force
! Coriolis_force, buoyancy
!
+!
+! heat_flux, part_h_flux
+! momentum_flux, maxwell_tensor
+! magnetic_induction, vecp_induction
+!
+! heat_advect, part_h_advect
+! inertia,
+! div_h_flux, div_part_h_flux
+! div_m_flux, div_maxwell_t
+!
+! induction_tensor, div_induct_t
+!
+! SGS_heat_flux
+! SGS_momentum_flux, SGS_maxwell_tensor
+! SGS_induct_tensor, SGS_vecp_induction
+!
+! div_SGS_h_flux, div_SGS_m_flux
+! SGS_Lorentz
+! SGS_induction,
+!
+! SGS_Lorentz_work Reynolds_work
+! SGS_temp_gen SGS_m_ene_gen
+!
+! termes for direct estimation
+! SGS_div_h_flux_true
+! SGS_div_m_flux_true, SGS_Lorentz_true, SGS_mag_induct_true
+!
+! SGS_Lorentz_work_true Reynolds_work_true
+! SGS_temp_gen_true SGS_m_ene_gen_true
+!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
begin phys_values_ctl
array nod_value_ctl 8
@@ -232,6 +272,10 @@ begin MHD_control
array coef_4_t_diffuse_ctl 1
coef_4_t_diffuse_ctl Prandtl_number -1.0
end array coef_4_t_diffuse_ctl
+!
+ array coef_4_heat_source_ctl 1
+ coef_4_heat_source_ctl One 1.0
+ end array coef_4_heat_source_ctl
end thermal
!
!
@@ -289,9 +333,14 @@ begin MHD_control
array coef_4_composition_ctl 1
coef_4_composition_ctl One 1.0
end array coef_4_composition_ctl
+!
array coef_4_c_diffuse_ctl 1
coef_4_c_diffuse_ctl Composite_Prandtl_number -1.0
end array coef_4_c_diffuse_ctl
+!
+ array coef_4_light_source_ctl 1
+ coef_4_light_source_ctl One 1.0
+ end array coef_4_light_source_ctl
end composition
!
end coefficients_ctl
@@ -409,7 +458,7 @@ begin MHD_control
! j = l*(l+1) + m
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
begin restart_file_ctl
- rst_ctl -2
+ rst_ctl dynamo_benchmark_1
end restart_file_ctl
!
!!!!!! method for time evolution !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -429,7 +478,7 @@ begin MHD_control
! method_4_velo_ctl: method for Crank Nicolson Scheme
! precond_4_crank_ctl: preconditioning method for Crank Nicolson Scheme
!
-! Legendre_trans_loop_ctl: Legendre transform loop type
+! Legendre_trans_loop_ctl: spherical transfer loop type
! ('inner_radial_loop' 'outer_radial_loop' 'long_loop')
! FFT_library_ctl: Selection of FFT librarry ('FFTW3' or 'FFTPACK')
!
@@ -441,6 +490,7 @@ begin MHD_control
coef_imp_t_ctl 5.0e-1
coef_imp_b_ctl 5.0e-1
coef_imp_c_ctl 5.0e-1
+ FFT_library_ctl 'ISPACK'
end time_loop_ctl
end control
!
diff --git a/src/programs/data_utilities/MERGE/control_assemble_sph b/src/programs/data_utilities/MERGE/control_assemble_sph
index d79bc1f..e256691 100644
--- a/src/programs/data_utilities/MERGE/control_assemble_sph
+++ b/src/programs/data_utilities/MERGE/control_assemble_sph
@@ -5,6 +5,9 @@ begin assemble_control
sph_file_prefix 'sph_lm31t48r96c_2/in'
restart_file_prefix 'rst_2/rst'
+!
+ sph_file_fmt_ctl 'gzip'
+ restart_file_fmt_ctl 'gzip'
end data_files_def
!
begin new_data_files_def
@@ -13,6 +16,9 @@ begin assemble_control
new_sph_mode_prefix 'sph_lm31t48r96c_4/in'
new_restart_prefix 'rst_4/rst'
!
+ new_sph_files_fmt_ctl 'ascii'
+ new_rst_files_fmt_ctl 'ascii'
+!
delete_original_data_flag 'YES'
end new_data_files_def
!
@@ -20,7 +26,7 @@ begin assemble_control
!!!!! information for time integration
begin time_step_ctl
i_step_init_ctl 0
- i_step_finish_ctl 2000
+ i_step_number_ctl 2000
i_step_rst_ctl 800
end time_step_ctl
end control
diff --git a/src/programs/data_utilities/Makefile b/src/programs/data_utilities/Makefile
index 4b4ba7b..be9c44b 100644
--- a/src/programs/data_utilities/Makefile
+++ b/src/programs/data_utilities/Makefile
@@ -19,7 +19,8 @@ dir_list:
( \
echo 'generate diectory list for ' $$dir ; \
cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
dir_list \
) \
@@ -29,7 +30,8 @@ dir_list:
target_list:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
BUILDDIR='$(BUILDDIR)' \
MAKENAME='$(MAKENAME)' \
target_list \
@@ -45,7 +47,8 @@ target_task:
@echo '' >> $(MAKENAME)
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
target_task \
) \
@@ -55,7 +58,8 @@ target_task:
lib_name:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
lib_name \
) \
@@ -64,7 +68,8 @@ lib_name:
mod_list:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
mod_list \
) \
@@ -74,7 +79,8 @@ mod_list:
module:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
MAKENAME='$(MAKENAME)' \
module; \
) \
@@ -85,7 +91,8 @@ module:
clean:
@for dir in $(SUBDIRS); do \
( cd $${dir}; \
- make \
+ $(GMAKE) \
+ GMAKE='$(GMAKE)' \
clean \
) \
done
More information about the CIG-COMMITS
mailing list