Skip to content

Commit

Permalink
changed extension from .i90 to .inc
Browse files Browse the repository at this point in the history
to avoid conflicts with intel preprocessor produced files
  • Loading branch information
jacobwilliams committed Oct 9, 2023
1 parent 28bbcd9 commit 5462fe3
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.i90 linguist-language=fortran
*.inc linguist-language=fortran
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@
/tmp
/archive
.DS_Store
/*.png
/*.png
__pycache__
8 changes: 4 additions & 4 deletions scripts/generate_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ def write_property_file(fixed_or_variable : str, methods : list):
################################################################################################
def write_property_interface_file(fixed_or_variable : str, methods : list):
"""Interfaces for the property methods (creates an include file)"""
with open(f'./src/rklib_{fixed_or_variable}_property_interfaces.i90', 'w') as f:
with open(f'./src/rklib_{fixed_or_variable}_property_interfaces.inc', 'w') as f:
for m in methods:
short_name, long_name, props, order, stages, registers, cfl, reference = m
f.write(f'pure module function {short_name}_properties(me) result(p)\n')
Expand All @@ -312,7 +312,7 @@ def write_property_interface_file(fixed_or_variable : str, methods : list):
################################################################################################
def write_class_file(fixed_or_variable : str, methods : list):
"""Defines the integrator classes (creates an include file)"""
with open(f'./src/rklib_{fixed_or_variable}_classes.i90', 'w') as f:
with open(f'./src/rklib_{fixed_or_variable}_classes.inc', 'w') as f:
f.write(f' ! {fixed_or_variable.capitalize()} step methods:\n\n')
for m in methods:
short_name, long_name, props, order, stages, registers, cfl, reference = m
Expand All @@ -329,7 +329,7 @@ def write_class_file(fixed_or_variable : str, methods : list):

def write_step_interface_file(fixed_or_variable : str, methods : list):
"""Interfaces for the step methods (creates an include file)"""
with open(f'./src/rklib_{fixed_or_variable}_step_interfaces.i90', 'w') as f:
with open(f'./src/rklib_{fixed_or_variable}_step_interfaces.inc', 'w') as f:
f.write(f' ! {fixed_or_variable} step interfaces\n\n')
for m in methods:
short_name, long_name, props, order, stages, registers, cfl, reference = m
Expand All @@ -349,7 +349,7 @@ def write_step_interface_file(fixed_or_variable : str, methods : list):

def write_allocate_and_test_file(methods : list):
"""Generate list of method allocations and test calls (creates an include file)"""
with open(f'./test/rklib_allocate_and_test.i90', 'w') as f:
with open(f'./test/rklib_allocate_and_test.inc', 'w') as f:
for m in methods:
f.write(f" allocate({m[0]}_class :: s); call run_test()\n")

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 6 additions & 6 deletions src/rklib_module.F90
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ module rklib_module
procedure,public :: set_fsal_cache
end type rk_variable_step_fsal_class

#include "rklib_fixed_classes.i90"
#include "rklib_variable_classes.i90"
#include "rklib_fixed_classes.inc"
#include "rklib_variable_classes.inc"

abstract interface

Expand Down Expand Up @@ -318,10 +318,10 @@ end function properties_func

! submodule procedures:
interface
#include "rklib_fixed_step_interfaces.i90"
#include "rklib_variable_step_interfaces.i90"
#include "rklib_fixed_property_interfaces.i90"
#include "rklib_variable_property_interfaces.i90"
#include "rklib_fixed_step_interfaces.inc"
#include "rklib_variable_step_interfaces.inc"
#include "rklib_fixed_property_interfaces.inc"
#include "rklib_variable_property_interfaces.inc"
end interface

! public routines:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion test/rk_test_order.F90
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ program rk_test_order
write(*, '(a10, a10, a24, a9)') 'Method', "Variable", "xf", "Success"
write(*, *) "----------------------------------------------------"

#include "rklib_allocate_and_test.i90"
#include "rklib_allocate_and_test.inc"

contains

Expand Down
File renamed without changes.

0 comments on commit 5462fe3

Please sign in to comment.