cleanup

Author: nschorgh

CITATION.cff

@@ -5,7 +5,7 @@ authors:
     given-names: Norbert
     orcid: https://orcid.org/0000-0002-5821-4066
 title: "Planetary-Code-Collection: Thermal, Ice Evolution, and Exosphere Models for Planetary Surfaces"
-version: 1.2.0
+version: 1.2.2
 doi: 10.5281/zenodo.594268
 url: "https://github.com/nschorgh/Planetary-Code-Collection/"
-date-released: 2022-12-30
+date-released: 2024-01-29

Common/Test/README_tests.txt

@@ -4,12 +4,13 @@ Validation and Example Results
 1. Test of a semi-implicit heat equation solver with prescribed surface
    temperature (conductionT.f90)
 
-make testcrankT
-a.out
+   make testcrankT
+   a.out
 
 - Tprofile_testcrankT contains 12 temperature profiles from the last sol
 - z.testcrankT contains the coordinates of the vertical grid
-- test_Tprofile.m reads these profiles and compares them to the analytical solution
+- test_Tprofile.m reads these profiles and compares them to the analytical
+  solution
 
 The result is shown in Figure 1.1 of the UserGuide.pdf
 
@@ -18,26 +19,27 @@ Note: The analytical solution is for an infinitely thick domain, so the small
 
 
 
-2. Example solution of semi-implicit heat equation solver with Stefan-Boltzmann Law
-   boundary condition (conductionQ.f90 or conductionQ2.f90)
+2. Example solution of semi-implicit heat equation solver with Stefan-Boltzmann
+   Law boundary condition (conductionQ.f90)
 
-make testcrankQ
-a.out 
+   make testcrankQ
+   a.out 
 
 - Tprofile_testcrankQ contains 12 temperature profiles from the last sol
 - z.testcrankQ contains the coordinates of the vertical grid
 - stdout_of_testcrankQ.txt contains the time-averaged temperature profile and
   heat flux
 After the temperature has equilibrated, the time-averaged heat flux must be
-constant with depth and must equal the heat flux specified at the bottom boundary.
+constant with depth and must equal the heat flux specified at the bottom
+boundary.
 
 
 
 3. Test implementation of nonlinear boundary condition in Crank-Nicolson solver
    (subroutine cranknQ)
 
-make testcrankQ_asymp
-a.out
+   make testcrankQ_asymp
+   a.out
 
 The numerical solution is in the 2nd column of the output file 'Tsurface_asymp'
 and the analytical solution for small times is in the 4th column. The result can
@@ -47,8 +49,8 @@ be plotted with testQ_asymp.m and is shown in Figure 1.4 of the UserGuide.pdf.
 
 4. Test rate of convergence of conductionQ.f90 with time step
 
-make testcrankQ_conv
-a.out
+   make testcrankQ_conv
+   a.out
 
 The output file 'Tprofiles' contains temperature profiles for eight different
 values for the time step. Errors can be defined by differences between these

Common/Test/makefile

@@ -21,15 +21,18 @@ testcrankT: testcrankT.o makefile
 	$(SR)grids.o
 
 testcrankQ_asymp asymp: testcrankQ_asymp.o makefile
-# 	use pure version of cranknQ
 	make CC='$(CC)' CFLAGS='$(CFLAGS)' -C $(SR) common
+# 	use legacy version of cranknQ
+#	which happens to be in Misc/conductionQ+smooth.f90
 	$(CC) $(CFLAGS) -c ../Misc/conductionQ+smooth.f90
 	$(CC) $(LFLAGS) testcrankQ_asymp.o conductionQ+smooth.o $(SR)tridag.o \
 	$(SR)grids.o
 
 testcrankQ_conv conv: testcrankQ_conv.o makefile
 	make -C $(SR) common
-	$(CC) -O1 testcrankQ_conv.o $(SR)flux_noatm.o $(SR)conductionQ.o \
+# 	use legacy version of cranknQ
+	$(CC) $(CFLAGS) -c ../Misc/conductionQ+smooth.f90
+	$(CC) -O1 testcrankQ_conv.o $(SR)flux_noatm.o conductionQ+smooth.o \
 	$(SR)tridag.o $(SR)grids.o