Use CRTM 2.4.0.1

ADCollard · Aug 14, 2024 · fd6be62 · fd6be62
1 parent ba90137
commit fd6be62
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 9 deletions.
diff --git a/modulefiles/gsi_hercules.intel.lua b/modulefiles/gsi_hercules.intel.lua
@@ -15,6 +15,16 @@ load(pathJoin("python", stack_python_ver))
 load(pathJoin("cmake", cmake_ver))
 
 load("gsi_common")
+setenv("crtm_ROOT","/work/noaa/da/eliu/HERCULES/CRTM/crtm_v2.4.1-jedi.1/build")
+setenv("crtm_VERSION","2.4.1-jedi.1")
+setenv("CRTM_INC","/work/noaa/da/eliu/HERCULES/CRTM/crtm_v2.4.1-jedi.1/build/module")
+setenv("CRTM_LIB","/work/noaa/da/eliu/HERCULES/CRTM/crtm_v2.4.1-jedi.1/build/lib/libcrtm_static.a")
+setenv("CRTM_FIX","/work/noaa/da/eliu/HERCULES/CRTM-fix/crtm_v2.4.1-jedi.1-fix_gdasapp")
+whatis("Name: crtm")
+whatis("Version: 2.4.1-jedi.1")
+whatis("Category: library")
+whatis("Description: crtm library")
+
 load(pathJoin("prod_util", prod_util_ver))
 load("intel-oneapi-mkl/2022.2.1")
 

diff --git a/modulefiles/gsi_orion.intel.lua b/modulefiles/gsi_orion.intel.lua
@@ -15,6 +15,16 @@ load(pathJoin("python", stack_python_ver))
 load(pathJoin("cmake", cmake_ver))
 
 load("gsi_common")
+setenv("crtm_ROOT","/work/noaa/da/eliu/ORION/CRTM/crtm_v2.4.1-jedi.1/build")
+setenv("crtm_VERSION","2.4.1-jedi.1")
+setenv("CRTM_INC","/work/noaa/da/eliu/ORION/CRTM/crtm_v2.4.1-jedi.1/build/module")
+setenv("CRTM_LIB","/work/noaa/da/eliu/ORION/CRTM/crtm_v2.4.1-jedi.1/build/lib/libcrtm_static.a")
+setenv("CRTM_FIX","/work/noaa/da/eliu/ORION/CRTM-fix/crtm_v2.4.1-jedi.1-fix_gdasapp")
+whatis("Name: crtm")
+whatis("Version: 2.4.1-jedi.1")
+whatis("Category: library")
+whatis("Description: crtm library")
+
 load(pathJoin("prod_util", prod_util_ver))
 load("intel-oneapi-mkl/2022.2.1")
 

diff --git a/src/gsi/CMakeLists.txt b/src/gsi/CMakeLists.txt
@@ -155,6 +155,7 @@ target_link_libraries(gsi_fortran_obj PUBLIC nemsio::nemsio)
 target_link_libraries(gsi_fortran_obj PUBLIC ncio::ncio)
 target_link_libraries(gsi_fortran_obj PUBLIC w3emc::w3emc_d)
 target_link_libraries(gsi_fortran_obj PUBLIC sp::sp_d)
+add_library(crtm::crtm ALIAS crtm)
 target_link_libraries(gsi_fortran_obj PUBLIC bufr::bufr_d)
 target_link_libraries(gsi_fortran_obj PUBLIC crtm::crtm)
 if(GSI_MODE MATCHES "Regional")

diff --git a/ush/run_observer/gsi_observer.sh b/ush/run_observer/gsi_observer.sh
@@ -307,7 +307,7 @@ cat > gsiparm.anl << EOF
   $OBSQC
 /
 &OBS_INPUT
-  dmesh(1)=145.0,dmesh(2)=150.0,dmesh(3)=100.0,time_window_max=3.0,
+  dmesh(1)=145.0,dmesh(2)=150.0,dmesh(3)=100.0,dmesh(4)=580,time_window_max=3.0,
   $OBSINPUT
 /
 OBS_INPUT::
@@ -362,7 +362,7 @@ OBS_INPUT::
    gsnd1bufr      sndrd2      g13         sndrD2_g13          0.0     1     0
    gsnd1bufr      sndrd3      g13         sndrD3_g13          0.0     1     0
    gsnd1bufr      sndrd4      g13         sndrD4_g13          0.0     1     0
-   iasibufr       iasi        metop-a     iasi_metop-a        0.0     1     0
+   iasibufr       iasi        metop-a     iasi_metop-a        0.0     4     0
    gomebufr       gome        metop-a     gome_metop-a        0.0     2     0
    omibufr        omi         aura        omi_aura            0.0     2     0
    sbuvbufr       sbuv2       n19         sbuv8_n19           0.0     0     0
@@ -377,15 +377,15 @@ OBS_INPUT::
 #   hirs4bufr      hirs4       metop-b     hirs4_metop-b       0.0     1     0
    amsuabufr      amsua       metop-b     amsua_metop-b       0.0     1     0
    mhsbufr        mhs         metop-b     mhs_metop-b         0.0     1     0
-   iasibufr       iasi        metop-b     iasi_metop-b        0.0     1     0
+   iasibufr       iasi        metop-b     iasi_metop-b        0.0     4     0
 #   gomebufr       gome        metop-b     gome_metop-b        0.0     2     0
    atmsbufr       atms        npp         atms_npp            0.0     1     0
    atmsbufr       atms        n20         atms_n20            0.0     1     0
    atmsbufr       atms        n21         atms_n21            0.0     1     0
-#   crisbufr       cris        npp         cris_npp            0.0     1     0
-#   crisfsbufr     cris-fsr    npp         cris-fsr_npp        0.0     1     0
-   crisfsbufr     cris-fsr    n20         cris-fsr_n20        0.0     1     0
-   crisfsbufr     cris-fsr    n21         cris-fsr_n21        0.0     1     0
+#   crisbufr       cris        npp         cris_npp            0.0     4     0
+#   crisfsbufr     cris-fsr    npp         cris-fsr_npp        0.0     4     0
+   crisfsbufr     cris-fsr    n20         cris-fsr_n20        0.0     4     0
+   crisfsbufr     cris-fsr    n21         cris-fsr_n21        0.0     4     0
 #   gsnd1bufr      sndrd1      g14         sndrD1_g14          0.0     1     0
 #   gsnd1bufr      sndrd2      g14         sndrD2_g14          0.0     1     0
 #   gsnd1bufr      sndrd3      g14         sndrD3_g14          0.0     1     0
@@ -412,7 +412,7 @@ OBS_INPUT::
    ompstcbufr     ompstc8     npp         ompstc8_npp         0.0     2     0
    amsuabufr      amsua       metop-c     amsua_metop-c       0.0     1     0
    mhsbufr        mhs         metop-c     mhs_metop-c         0.0     1     0
-   iasibufr       iasi        metop-c     iasi_metop-c        0.0     1     0
+   iasibufr       iasi        metop-c     iasi_metop-c        0.0     4     0
 ::
 &SUPEROB_RADAR
   $SUPERRAD

diff --git a/ush/run_observer/submit_gsi_observer.sh b/ush/run_observer/submit_gsi_observer.sh
@@ -33,7 +33,7 @@ CRTM_FIX=/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/u
 # so that GSI observer can run at full background res
 GSIFIX=/work2/noaa/da/cmartin/UFO_eval/geovals/GSI/fix
 dumpdir=/work/noaa/rstprod/dump
-gesroot=/work2/noaa/da/acollard/UFO_eval/data/para/output_ufo_eval_feb2024/
+gesroot=/work2/noaa/da/acollard/UFO_eval/data/para/output_ufo_eval_feb2024_9Aug
 
 mkdir -p $workdir
 cd $workdir
@@ -52,4 +52,5 @@ export GDASApp=$GDASApp
 export MACHINE=$MACHINE
 EOF
 
+#sbatch $GSIDIR/ush/run_observer/gsi_observer.sh $workdir/config.sh
 sbatch $GSIDIR/ush/run_observer/gsi_observer.sh $workdir/config.sh