Repository navigation
Commit 110371b
david.ham@imperial.ac.uk
significant cleanup of the python script. Split makefile dependencies out
1 parent 90d29aa commit 110371b
19 files changed
Lines changed: 52 additions & 3416 deletions
File tree
- adjoint
- assemble
- bathymetry
- debug
- decomp
- diagnostics
- error_measures
- femtools
- forward_interfaces
- horizontal_adaptivity
- libwm
- main
- ocean_forcing
- parameterisation
- preprocessor
- radiation
- reduced_modelling
- scripts
- sediments
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -71,84 +71,4 @@ default: $(LIB) | |||
| 71 | 71 | clean: | |
| 72 | 72 | rm -f *.o *.d *.mod | |
| 73 | 73 | ||
| 74 | - #####Automatically generated dependencies. Do not edit below this line##### | ||
| 75 | - ../include/adjoint_functional_evaluation.mod: Adjoint_Functional_Evaluation.o | ||
| 76 | - @true | ||
| 77 | - | ||
| 78 | - Adjoint_Functional_Evaluation.o ../include/adjoint_functional_evaluation.mod: \ | ||
| 79 | - Adjoint_Functional_Evaluation.F90 ../include/fdebug.h | ||
| 80 | - | ||
| 81 | - ../include/adjoint_global_variables.mod: Adjoint_Global_Variables.o | ||
| 82 | - @true | ||
| 83 | - | ||
| 84 | - Adjoint_Global_Variables.o ../include/adjoint_global_variables.mod: \ | ||
| 85 | - Adjoint_Global_Variables.F90 ../include/fdebug.h | ||
| 86 | - | ||
| 87 | - ../include/adjoint_main_loop.mod: Adjoint_Main_Loop.o | ||
| 88 | - @true | ||
| 89 | - | ||
| 90 | - Adjoint_Main_Loop.o ../include/adjoint_main_loop.mod: Adjoint_Main_Loop.F90 \ | ||
| 91 | - ../include/adjoint_functional_evaluation.mod ../include/sparse_tools.mod \ | ||
| 92 | - ../include/signal_vars.mod ../include/adjoint_global_variables.mod \ | ||
| 93 | - ../include/diagnostic_fields_new.mod ../include/write_state_module.mod \ | ||
| 94 | - ../include/diagnostic_fields_wrapper.mod ../include/solvers.mod \ | ||
| 95 | - ../include/populate_state_module.mod ../include/global_parameters.mod \ | ||
| 96 | - ../include/fields.mod ../include/fdebug.h ../include/spud.mod \ | ||
| 97 | - ../include/mangle_options_tree.mod ../include/sparse_matrices_fields.mod \ | ||
| 98 | - ../include/mangle_dirichlet_rows_module.mod \ | ||
| 99 | - ../include/diagnostic_variables.mod ../include/state_module.mod | ||
| 100 | - | ||
| 101 | - ../include/adjoint_python.mod: Adjoint_Python_Fortran.o | ||
| 102 | - @true | ||
| 103 | - | ||
| 104 | - Adjoint_Python_Fortran.o ../include/adjoint_python.mod: \ | ||
| 105 | - Adjoint_Python_Fortran.F90 ../include/fdebug.h | ||
| 106 | - | ||
| 107 | - ../include/burgers_adjoint_callbacks.mod: Burgers_Adjoint_Callbacks.o | ||
| 108 | - @true | ||
| 109 | - | ||
| 110 | - Burgers_Adjoint_Callbacks.o ../include/burgers_adjoint_callbacks.mod: \ | ||
| 111 | - Burgers_Adjoint_Callbacks.F90 ../include/fdebug.h | ||
| 112 | - | ||
| 113 | - ../include/forward_main_loop.mod: Forward_Main_Loop.o | ||
| 114 | - @true | ||
| 115 | - | ||
| 116 | - Forward_Main_Loop.o ../include/forward_main_loop.mod: Forward_Main_Loop.F90 \ | ||
| 117 | - ../include/diagnostic_fields_new.mod \ | ||
| 118 | - ../include/adjoint_functional_evaluation.mod ../include/sparse_tools.mod \ | ||
| 119 | - ../include/signal_vars.mod ../include/adjoint_global_variables.mod \ | ||
| 120 | - ../include/write_state_module.mod ../include/diagnostic_fields_wrapper.mod \ | ||
| 121 | - ../include/solvers.mod ../include/populate_state_module.mod \ | ||
| 122 | - ../include/global_parameters.mod ../include/fields.mod ../include/fdebug.h \ | ||
| 123 | - ../include/spud.mod ../include/mangle_options_tree.mod \ | ||
| 124 | - ../include/sparse_matrices_fields.mod \ | ||
| 125 | - ../include/mangle_dirichlet_rows_module.mod \ | ||
| 126 | - ../include/diagnostic_variables.mod ../include/state_module.mod | ||
| 127 | - | ||
| 128 | - Libadjoint_Data_Callbacks.o : Libadjoint_Data_Callbacks.F90 | ||
| 129 | - | ||
| 130 | - ../include/mangle_dirichlet_rows_module.mod: Mangle_Dirichlet_Rows_Module.o | ||
| 131 | - @true | ||
| 132 | - | ||
| 133 | - Mangle_Dirichlet_Rows_Module.o ../include/mangle_dirichlet_rows_module.mod: \ | ||
| 134 | - Mangle_Dirichlet_Rows_Module.F90 ../include/boundary_conditions.mod \ | ||
| 135 | - ../include/boundary_conditions_from_options.mod \ | ||
| 136 | - ../include/field_options.mod ../include/fields.mod \ | ||
| 137 | - ../include/sparse_matrices_fields.mod ../include/fdebug.h | ||
| 138 | - | ||
| 139 | - ../include/mangle_options_tree.mod: Mangle_Options_Tree.o | ||
| 140 | - @true | ||
| 141 | - | ||
| 142 | - Mangle_Options_Tree.o ../include/mangle_options_tree.mod: \ | ||
| 143 | - Mangle_Options_Tree.F90 ../include/futils.mod ../include/field_options.mod \ | ||
| 144 | - ../include/global_parameters.mod ../include/spud.mod ../include/fdebug.h \ | ||
| 145 | - ../include/fldebug.mod | ||
| 146 | - | ||
| 147 | - ../include/shallow_water_adjoint_callbacks.mod: \ | ||
| 148 | - Shallow_Water_Adjoint_Callbacks.o | ||
| 149 | - @true | ||
| 150 | - | ||
| 151 | - Shallow_Water_Adjoint_Callbacks.o \ | ||
| 152 | - ../include/shallow_water_adjoint_callbacks.mod: \ | ||
| 153 | - Shallow_Water_Adjoint_Callbacks.F90 ../include/fdebug.h | ||
| 154 | - | ||
| 74 | + include Makefile.dependencies | ||
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -81,4 +81,4 @@ install: | |||
| 81 | 81 | ||
| 82 | 82 | clean: | |
| 83 | 83 | rm -f *.o *.mod | |
| 84 | - | ||
| 84 | + include Makefile.dependencies | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -76,17 +76,4 @@ $(F90LIB): $(F90LIB_OBJS) | |||
| 76 | 76 | clean: | |
| 77 | 77 | rm -f *.o *.mod | |
| 78 | 78 | ||
| 79 | - #####Automatically generated dependencies. Do not edit below this line##### | ||
| 80 | - ../include/fldebug.mod: Debug.o | ||
| 81 | - @true | ||
| 82 | - | ||
| 83 | - Debug.o ../include/fldebug.mod: Debug.F90 ../include/fldebug_parameters.mod \ | ||
| 84 | - ../include/fdebug.h | ||
| 85 | - | ||
| 86 | - ../include/fldebug_parameters.mod: Debug_Parameters.o | ||
| 87 | - @true | ||
| 88 | - | ||
| 89 | - Debug_Parameters.o ../include/fldebug_parameters.mod: Debug_Parameters.F90 | ||
| 90 | - | ||
| 91 | - Diagnostic_Output.o : Diagnostic_Output.F90 ../include/fldebug_parameters.mod | ||
| 92 | - | ||
| 79 | + include Makefile.dependencies | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -64,4 +64,4 @@ default: $(LIB) | |||
| 64 | 64 | ||
| 65 | 65 | clean: | |
| 66 | 66 | rm -f *.o *.mod | |
| 67 | - | ||
| 67 | + include Makefile.dependencies | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -82,144 +82,4 @@ clean: | |||
| 82 | 82 | rm -f *.o *.d *.mod | |
| 83 | 83 | rm -f $(AUTO_WRAPPER).F90 | |
| 84 | 84 | ||
| 85 | - #####Automatically generated dependencies. Do not edit below this line##### | ||
| 86 | - ../include/adjoint_functionals.mod: Adjoint_Functionals.o | ||
| 87 | - @true | ||
| 88 | - | ||
| 89 | - Adjoint_Functionals.o ../include/adjoint_functionals.mod: \ | ||
| 90 | - Adjoint_Functionals.F90 ../include/global_parameters.mod \ | ||
| 91 | - ../include/fields.mod ../include/embed_python.mod ../include/spud.mod \ | ||
| 92 | - ../include/state_module.mod ../include/python_state.mod ../include/fdebug.h \ | ||
| 93 | - ../include/fldebug.mod | ||
| 94 | - | ||
| 95 | - ../include/binary_operators.mod: Binary_Operators.o | ||
| 96 | - @true | ||
| 97 | - | ||
| 98 | - Binary_Operators.o ../include/binary_operators.mod: Binary_Operators.F90 \ | ||
| 99 | - ../include/diagnostic_source_fields.mod ../include/field_options.mod \ | ||
| 100 | - ../include/global_parameters.mod ../include/fields.mod ../include/spud.mod \ | ||
| 101 | - ../include/state_module.mod ../include/fdebug.h ../include/fldebug.mod | ||
| 102 | - | ||
| 103 | - ../include/diagnostic_source_fields.mod: Diagnostic_Source_Fields.o | ||
| 104 | - @true | ||
| 105 | - | ||
| 106 | - Diagnostic_Source_Fields.o ../include/diagnostic_source_fields.mod: \ | ||
| 107 | - Diagnostic_Source_Fields.F90 ../include/field_options.mod \ | ||
| 108 | - ../include/global_parameters.mod ../include/fields.mod ../include/spud.mod \ | ||
| 109 | - ../include/fdebug.h ../include/state_module.mod | ||
| 110 | - | ||
| 111 | - ../include/differential_operator_diagnostics.mod: Differential_Operators.o | ||
| 112 | - @true | ||
| 113 | - | ||
| 114 | - Differential_Operators.o ../include/differential_operator_diagnostics.mod: \ | ||
| 115 | - Differential_Operators.F90 ../include/solvers.mod \ | ||
| 116 | - ../include/geostrophic_pressure.mod ../include/diagnostic_source_fields.mod \ | ||
| 117 | - ../include/quadrature.mod ../include/sparsity_patterns_meshes.mod \ | ||
| 118 | - ../include/field_options.mod ../include/global_parameters.mod \ | ||
| 119 | - ../include/sparse_tools.mod ../include/elements.mod ../include/fields.mod \ | ||
| 120 | - ../include/divergence_matrix_cg.mod ../include/field_derivatives.mod \ | ||
| 121 | - ../include/spud.mod ../include/eventcounter.mod \ | ||
| 122 | - ../include/sparse_matrices_fields.mod ../include/fldebug.mod \ | ||
| 123 | - ../include/state_fields_module.mod ../include/fdebug.h \ | ||
| 124 | - ../include/state_module.mod | ||
| 125 | - | ||
| 126 | - ../include/field_copies_diagnostics.mod: Field_Copies.o | ||
| 127 | - @true | ||
| 128 | - | ||
| 129 | - Field_Copies.o ../include/field_copies_diagnostics.mod: Field_Copies.F90 \ | ||
| 130 | - ../include/diagnostic_source_fields.mod ../include/sparse_tools.mod \ | ||
| 131 | - ../include/sparsity_patterns_meshes.mod ../include/transform_elements.mod \ | ||
| 132 | - ../include/solvers.mod ../include/field_options.mod \ | ||
| 133 | - ../include/global_parameters.mod ../include/fields.mod ../include/spud.mod \ | ||
| 134 | - ../include/state_fields_module.mod ../include/sparse_matrices_fields.mod \ | ||
| 135 | - ../include/state_module.mod ../include/smoothing_module.mod \ | ||
| 136 | - ../include/fdebug.h ../include/fldebug.mod | ||
| 137 | - | ||
| 138 | - ../include/mesh_diagnostics.mod: Mesh_Diagnostics.o | ||
| 139 | - @true | ||
| 140 | - | ||
| 141 | - Mesh_Diagnostics.o ../include/mesh_diagnostics.mod: Mesh_Diagnostics.F90 \ | ||
| 142 | - ../include/diagnostic_source_fields.mod ../include/field_options.mod \ | ||
| 143 | - ../include/global_parameters.mod ../include/fields.mod ../include/spud.mod \ | ||
| 144 | - ../include/halos_numbering.mod ../include/state_module.mod \ | ||
| 145 | - ../include/fdebug.h ../include/fldebug.mod | ||
| 146 | - | ||
| 147 | - ../include/metric_diagnostics.mod: Metric_Diagnostics.o | ||
| 148 | - @true | ||
| 149 | - | ||
| 150 | - Metric_Diagnostics.o ../include/metric_diagnostics.mod: Metric_Diagnostics.F90 \ | ||
| 151 | - ../include/form_metric_field.mod ../include/diagnostic_source_fields.mod \ | ||
| 152 | - ../include/quicksort.mod ../include/conformity_measurement.mod \ | ||
| 153 | - ../include/vector_tools.mod ../include/field_options.mod \ | ||
| 154 | - ../include/fields.mod ../include/metric_tools.mod ../include/spud.mod \ | ||
| 155 | - ../include/field_derivatives.mod ../include/edge_length_module.mod \ | ||
| 156 | - ../include/state_module.mod ../include/fdebug.h ../include/fldebug.mod | ||
| 157 | - | ||
| 158 | - ../include/momentum_diagnostics.mod: Momentum_Diagnostics.o | ||
| 159 | - @true | ||
| 160 | - | ||
| 161 | - Momentum_Diagnostics.o ../include/momentum_diagnostics.mod: \ | ||
| 162 | - Momentum_Diagnostics.F90 ../include/multimaterial_module.mod \ | ||
| 163 | - ../include/boundary_conditions.mod ../include/diagnostic_source_fields.mod \ | ||
| 164 | - ../include/coriolis_module.mod ../include/sparsity_patterns_meshes.mod \ | ||
| 165 | - ../include/spud.mod ../include/solvers.mod ../include/field_options.mod \ | ||
| 166 | - ../include/global_parameters.mod ../include/geostrophic_pressure.mod \ | ||
| 167 | - ../include/fields.mod ../include/state_fields_module.mod \ | ||
| 168 | - ../include/field_derivatives.mod ../include/state_module.mod \ | ||
| 169 | - ../include/fdebug.h ../include/fldebug.mod | ||
| 170 | - | ||
| 171 | - ../include/multiphase_diagnostics.mod: Multiphase_Diagnostics.o | ||
| 172 | - @true | ||
| 173 | - | ||
| 174 | - Multiphase_Diagnostics.o ../include/multiphase_diagnostics.mod: \ | ||
| 175 | - Multiphase_Diagnostics.F90 ../include/field_options.mod \ | ||
| 176 | - ../include/global_parameters.mod ../include/fields.mod ../include/spud.mod \ | ||
| 177 | - ../include/state_fields_module.mod ../include/state_module.mod \ | ||
| 178 | - ../include/fdebug.h ../include/fldebug.mod | ||
| 179 | - | ||
| 180 | - ../include/parallel_diagnostics.mod: Parallel_Diagnostics.o | ||
| 181 | - @true | ||
| 182 | - | ||
| 183 | - Parallel_Diagnostics.o ../include/parallel_diagnostics.mod: \ | ||
| 184 | - Parallel_Diagnostics.F90 ../include/halos.mod ../include/fields.mod \ | ||
| 185 | - ../include/fdebug.h ../include/fldebug.mod | ||
| 186 | - | ||
| 187 | - ../include/python_diagnostics.mod: Python_Diagnostics.o | ||
| 188 | - @true | ||
| 189 | - | ||
| 190 | - Python_Diagnostics.o ../include/python_diagnostics.mod: Python_Diagnostics.F90 \ | ||
| 191 | - ../include/global_parameters.mod ../include/fields.mod ../include/spud.mod \ | ||
| 192 | - ../include/state_module.mod ../include/python_state.mod ../include/fdebug.h \ | ||
| 193 | - ../include/fldebug.mod | ||
| 194 | - | ||
| 195 | - ../include/simple_diagnostics.mod: Simple_Diagnostics.o | ||
| 196 | - @true | ||
| 197 | - | ||
| 198 | - Simple_Diagnostics.o ../include/simple_diagnostics.mod: Simple_Diagnostics.F90 \ | ||
| 199 | - ../include/vtk_cache_module.mod ../include/diagnostic_source_fields.mod \ | ||
| 200 | - ../include/fields_manipulation.mod ../include/spud.mod \ | ||
| 201 | - ../include/field_options.mod ../include/global_parameters.mod \ | ||
| 202 | - ../include/fields.mod ../include/initialise_fields_module.mod \ | ||
| 203 | - ../include/state_fields_module.mod ../include/state_module.mod \ | ||
| 204 | - ../include/fdebug.h ../include/fldebug.mod | ||
| 205 | - | ||
| 206 | - ../include/surface_diagnostics.mod: Surface.o | ||
| 207 | - @true | ||
| 208 | - | ||
| 209 | - Surface.o ../include/surface_diagnostics.mod: Surface.F90 \ | ||
| 210 | - ../include/surface_integrals.mod ../include/diagnostic_source_fields.mod \ | ||
| 211 | - ../include/field_options.mod ../include/global_parameters.mod \ | ||
| 212 | - ../include/fields.mod ../include/spud.mod ../include/state_module.mod \ | ||
| 213 | - ../include/fdebug.h ../include/fldebug.mod | ||
| 214 | - | ||
| 215 | - ../include/tidal_diagnostics.mod: Tidal_Diagnostics.o | ||
| 216 | - @true | ||
| 217 | - | ||
| 218 | - Tidal_Diagnostics.o ../include/tidal_diagnostics.mod: Tidal_Diagnostics.F90 \ | ||
| 219 | - ../include/diagnostic_source_fields.mod ../include/fields_manipulation.mod \ | ||
| 220 | - ../include/spud.mod ../include/field_options.mod \ | ||
| 221 | - ../include/global_parameters.mod ../include/fields.mod \ | ||
| 222 | - ../include/tidal_module.mod ../include/initialise_fields_module.mod \ | ||
| 223 | - ../include/state_fields_module.mod ../include/state_module.mod \ | ||
| 224 | - ../include/fdebug.h ../include/fldebug.mod | ||
| 225 | - | ||
| 85 | + include Makefile.dependencies | ||
0 commit comments