From bbfcd5f75b2f72d40294550e5a919c7bf332b2d1 Mon Sep 17 00:00:00 2001
From: Evgeny Mortikov <evgeny.mortikov@gmail.com>
Date: Mon, 18 Dec 2023 03:37:05 +0300
Subject: [PATCH] moving macro defs. in separate include file
---
srcF/sfx_def.fi | 4 ++++
srcF/sfx_esm.f90 | 8 ++------
srcF/sfx_log.f90 | 6 ++----
srcF/sfx_roughness.f90 | 6 ++----
4 files changed, 10 insertions(+), 14 deletions(-)
create mode 100644 srcF/sfx_def.fi
diff --git a/srcF/sfx_def.fi b/srcF/sfx_def.fi
new file mode 100644
index 0000000..6d90e99
--- /dev/null
+++ b/srcF/sfx_def.fi
@@ -0,0 +1,4 @@
+! sfx model macro definitions
+
+!#define SFX_FORCE_DEPRECATED_CODE
+!#define SFX_CHECK_NAN
\ No newline at end of file
diff --git a/srcF/sfx_esm.f90 b/srcF/sfx_esm.f90
index 2633a84..9dbe10c 100644
--- a/srcF/sfx_esm.f90
+++ b/srcF/sfx_esm.f90
@@ -1,12 +1,8 @@
+#include "sfx_def.fi"
+
module sfx_esm
!> @brief main Earth System Model surface flux module
- ! macro defs.
- ! --------------------------------------------------------------------------------
-!#define SFX_FORCE_DEPRECATED_CODE
-!#define SFX_CHECK_NAN
- ! --------------------------------------------------------------------------------
-
! modules used
! --------------------------------------------------------------------------------
#ifdef SFX_CHECK_NAN
diff --git a/srcF/sfx_log.f90 b/srcF/sfx_log.f90
index a3c3465..1781544 100644
--- a/srcF/sfx_log.f90
+++ b/srcF/sfx_log.f90
@@ -1,10 +1,8 @@
+#include "sfx_def.fi"
+
module sfx_log
!> @brief simple log-roughness surface flux module
- ! macro defs.
- ! --------------------------------------------------------------------------------
- ! --------------------------------------------------------------------------------
-
! modules used
! --------------------------------------------------------------------------------
#ifdef SFX_CHECK_NAN
diff --git a/srcF/sfx_roughness.f90 b/srcF/sfx_roughness.f90
index 8e01cc9..e5e5463 100644
--- a/srcF/sfx_roughness.f90
+++ b/srcF/sfx_roughness.f90
@@ -1,10 +1,8 @@
+#include "sfx_def.fi"
+
module sfx_roughness
!> @brief surface roughness parameterizations
- ! macro defs.
- ! --------------------------------------------------------------------------------
- ! --------------------------------------------------------------------------------
-
! modules used
! --------------------------------------------------------------------------------
use sfx_phys_const
--
GitLab