stardis

commit be606b926fdd3890934cb16777d84603cfb645c3
parent 69c59d78d03eb7e2a978123843600b16cfef8c34
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Thu, 22 Sep 2022 16:34:13 +0200

Reorder fields following H+F boundaries

Diffstat:
M
doc/stardis-input.5.txt
 | 
2
+-
M
src/stardis-hfbound.c
 | 
4
++--
M
src/stardis-parsing.c
 | 
20
++++++++++----------

3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/doc/stardis-input.5.txt b/doc/stardis-input.5.txt
@@ -132,7 +132,7 @@ _______
                                 <triangles>
 
 <hf-bound-for-solid>        ::= "HF_BOUNDARY_FOR_SOLID" <bound-name> <Tref> <emissivity> \
-                                <specular-fraction> <hc> <flux> <outside-temperature> \
+                                <specular-fraction> <hc> <outside-temperature> <flux> \
                                 <triangles>
 
 <h-bound-for-fluid>         ::= "H_BOUNDARY_FOR_FLUID" <bound-name> <Tref> <emissivity> \
diff --git a/src/stardis-hfbound.c b/src/stardis-hfbound.c
@@ -77,10 +77,10 @@ str_print_hf_boundary
   b = desc->d.hf_boundary;
   ERR(str_append_printf(str,
     "HF boundary for %s '%s': ref_temperature=%g emissivity=%g specular_fraction=%g "
-    "hc=%g flux=%g T=%g (using medium %u as external medium)",
+    "hc=%g T=%g flux=%g (using medium %u as external medium)",
     (desc->type == DESC_BOUND_HF_FOR_SOLID ? "solid" : "fluid"),
     str_cget(&b->name), b->ref_temperature, b->emissivity,
-    b->specular_fraction, b->hc, b->imposed_flux, b->imposed_temperature,
+    b->specular_fraction, b->hc, b->imposed_temperature, b->imposed_flux,
     b->mat_id));
 end:
   return res;
diff --git a/src/stardis-parsing.c b/src/stardis-parsing.c
@@ -466,7 +466,7 @@ error:
 }
 
 /* HF_BOUNDARY_FOR_SOLID Name ref_temperature emissivity specular_fraction hc
- * flux T_env STL_filenames */
+ * T_env flux STL_filenames */
 static res_T
 process_hf
   (struct stardis* stardis,
@@ -544,6 +544,15 @@ process_hf
     if(res == RES_OK) res = RES_BAD_ARG;
     goto end;
   }
+  CHK_ARG(idx, "temperature");
+  res = cstr_to_double(arg, &hf_boundary->imposed_temperature);
+  if(res != RES_OK
+    || hf_boundary->imposed_temperature < 0)
+  {
+    logger_print(stardis->logger, LOG_ERROR, "Invalid temperature: %s\n", arg);
+    if(res == RES_OK) res = RES_BAD_ARG;
+    goto end;
+  }
   CHK_ARG(idx, "flux");
   res = cstr_to_double(arg, &hf_boundary->imposed_flux);
   if(res != RES_OK
@@ -554,15 +563,6 @@ process_hf
     if(res == RES_OK) res = RES_BAD_ARG;
     goto end;
   }
-  CHK_ARG(idx, "temperature");
-  res = cstr_to_double(arg, &hf_boundary->imposed_temperature);
-  if(res != RES_OK
-    || hf_boundary->imposed_temperature < 0)
-  {
-    logger_print(stardis->logger, LOG_ERROR, "Invalid temperature: %s\n", arg);
-    if(res == RES_OK) res = RES_BAD_ARG;
-    goto end;
-  }
   stardis->t_range[0] = MMIN(stardis->t_range[0], hf_boundary->imposed_temperature);
   stardis->t_range[1] = MMAX(stardis->t_range[1], hf_boundary->imposed_temperature);