Fix bug in find-vars.sh and update mptrac_fortran.f90

slcs-jsc · Jan 8, 2025 · 6101c46 · 6101c46
1 parent 355e934
commit 6101c46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/mptrac_fortran.f90 b/src/mptrac_fortran.f90
@@ -128,6 +128,9 @@ MODULE mptrac_struct
      INTEGER(c_int) :: qnt_zs
      INTEGER(c_int) :: qnt_us
      INTEGER(c_int) :: qnt_vs
+     INTEGER(c_int) :: qnt_ess
+     INTEGER(c_int) :: qnt_nss
+     INTEGER(c_int) :: qnt_shf
      INTEGER(c_int) :: qnt_lsm
      INTEGER(c_int) :: qnt_sst
      INTEGER(c_int) :: qnt_pbl
@@ -261,6 +264,9 @@ MODULE mptrac_struct
      CHARACTER(c_char), DIMENSION(length) :: balloon
      INTEGER(c_int) :: advect
      INTEGER(c_int) :: rng_type
+     INTEGER(c_int) :: diffusion
+     INTEGER(c_int) :: diff_mix_pbl
+     INTEGER(c_int) :: diff_pbl_trans
      REAL(c_double) :: turb_dx_pbl
      REAL(c_double) :: turb_dx_trop
      REAL(c_double) :: turb_dx_strat
@@ -434,6 +440,9 @@ MODULE mptrac_struct
      REAL(c_float), DIMENSION(ey,ex) :: zs
      REAL(c_float), DIMENSION(ey,ex) :: us
      REAL(c_float), DIMENSION(ey,ex) :: vs
+     REAL(c_float), DIMENSION(ey,ex) :: ess
+     REAL(c_float), DIMENSION(ey,ex) :: nss
+     REAL(c_float), DIMENSION(ey,ex) :: shf
      REAL(c_float), DIMENSION(ey,ex) :: lsm
      REAL(c_float), DIMENSION(ey,ex) :: sst
      REAL(c_float), DIMENSION(ey,ex) :: pbl

diff --git a/tests/wrapper_test/find-vars.sh b/tests/wrapper_test/find-vars.sh
@@ -14,7 +14,7 @@ awk '/TYPE, bind\(c\) :: clim_ts_t/{f=1;next} /END TYPE clim_ts_t/{f=0} f' < ../
 awk '/TYPE, bind\(c\) :: clim_photo_t/{f=1;next} /END TYPE clim_photo_t/{f=0} f' < ../../src/mptrac_fortran.f90 > data/test_clim_photo_f.asc
 awk '/TYPE, bind\(c\) :: atm_t/{f=1;next} /END TYPE atm_t/{f=0} f' < ../../src/mptrac_fortran.f90 > data/test_atm_f.asc
 
-awk '/Control parameters/{f=1;next} /\} ctl_t;/{f=0} f' < ../../src/mptrac.h > data/test_ctl_c.asc
+awk '/brief Control parameters/{f=1;next} /\} ctl_t;/{f=0} f' < ../../src/mptrac.h > data/test_ctl_c.asc
 awk '/Meteo data structure/{f=1;next} /\} met_t;/{f=0} f' < ../../src/mptrac.h > data/test_met_c.asc
 awk '/climatological data containing/{f=1;next} /\} clim_t;/{f=0} f' < ../../src/mptrac.h > data/test_clim_c.asc
 awk '/Climatological data in the form of zonal means./{f=1;next} /\} clim_zm_t;/{f=0} f' < ../../src/mptrac.h > data/test_clim_zm_c.asc