Skip to content

Commit 31ebee9

Browse files
committed
stub, various
1 parent da69cdc commit 31ebee9

5 files changed

Lines changed: 22 additions & 1 deletion

File tree

make/makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,7 @@ $(OBJDIR)/RunControlFactory.o \
592592
$(OBJDIR)/IdmLoad.o \
593593
$(OBJDIR)/ConnectionBuilder.o \
594594
$(OBJDIR)/comarg.o \
595+
$(OBJDIR)/DfnSpec.o \
595596
$(OBJDIR)/mf6core.o \
596597
$(OBJDIR)/BaseGeometry.o \
597598
$(OBJDIR)/mf6.o \

msvs/mf6core.vfproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,7 @@
865865
<File RelativePath="..\src\Utilities\BudgetTerm.f90"/>
866866
<File RelativePath="..\src\Utilities\CharString.f90"/>
867867
<File RelativePath="..\src\Utilities\comarg.f90"/>
868+
<File RelativePath="..\src\Utilities\DfnSpec.f90"/>
868869
<File RelativePath="..\src\Utilities\compilerversion.F90">
869870
<FileConfiguration Name="Debug|Win32">
870871
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/>

pymake/makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ $(OBJDIR)/IdmDfnSelector.o \
144144
$(OBJDIR)/DefinitionSelect.o \
145145
$(OBJDIR)/ArrayReaders.o \
146146
$(OBJDIR)/comarg.o \
147+
$(OBJDIR)/DfnSpec.o \
147148
$(OBJDIR)/STLVecInt.o \
148149
$(OBJDIR)/BlockParser.o \
149150
$(OBJDIR)/CircularGeometry.o \

src/Utilities/DfnSpec.f90

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
! Stub for non-Meson builds (MSVS, make, etc.). The real DfnSpec.f90 is
2+
! generated at build time by the Meson custom_target via:
3+
! python utils/idmloader/scripts/dfn2f90.py --spec <output>
4+
module DfnSpecModule
5+
use, intrinsic :: iso_fortran_env, only: output_unit
6+
implicit none
7+
private
8+
public :: write_spec
9+
10+
contains
11+
12+
subroutine write_spec()
13+
write (output_unit, '(a)') &
14+
'DFN spec not available: rebuild with Meson to enable this feature)'
15+
end subroutine write_spec
16+
17+
end module DfnSpecModule

src/Utilities/comarg.f90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ module CommandArguments
66
use VersionModule, only: VERSION, MFVNAM, IDEVELOPMODE, &
77
FMTDISCLAIMER, write_license
88
use DfnSpecModule, only: write_spec
9+
use FeatureFlagsModule, only: developmode
910
use CompilerVersion
1011
use SimVariablesModule, only: istdout, isim_level, &
1112
simfile, simlstfile, simstdout, &
@@ -171,6 +172,7 @@ subroutine GetCommandLineArguments()
171172
call write_license()
172173
case ('-SPEC', '--SPEC')
173174
lstop = .TRUE.
175+
call developmode('--spec is a development feature.', istdout)
174176
call write_spec()
175177
case ('-CO', '--COMPILER-OPT')
176178
lstop = .TRUE.
@@ -277,7 +279,6 @@ subroutine write_usage(header, cexe)
277279
&' -lic --license Display program license information.',/,&
278280
&' -c --compiler Display compiler information.',/,&
279281
&' -co --compiler-opt Display compiler options.',/,&
280-
&' -spec --spec Emit embedded DFN input spec to stdout.',/,&
281282
&' -s --silent All STDOUT to mfsim.stdout.',/,"// &
282283
"' -l <str> --level <str> STDOUT output to screen based on <str>.',/,&
283284
&' <str>=summary Limited output to STDOUT.',/,&

0 commit comments

Comments
 (0)