Changeset 2979

Timestamp:

Jun 9, 2023, 3:06:52 PM (20 months ago)

Author:

abierjon

Message:

Mars GCM:
Adapt simu_MCS.F90 so that it also recognizes new dust opacity names from aeroptical (since r2817 : "opa_dust" instead of "opadust")
(retrocompatible with old names as well)

AB

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• util/simu_MCS.F90 (modified) (2 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4065 +4065 @@
 Also updated "deftank/field_def_physics_mars.xml" to keep up with recently added
 variables
+
+== 09/06/2023 == AB
+Adapt simu_MCS.F90 so that it also recognizes new dust opacity names from aeroptical (since r2817 : "opa_dust" instead of "opadust")
+(retrocompatible with old names as well)

trunk/LMDZ.MARS/util/simu_MCS.F90

@@ -1573 +1573 @@
     status=nf90_inq_varid(outfid,trim(out_dztauname),out_dztauid)
     if (status.ne.nf90_noerr) then
-      ! if no "d/ndust" in outfile, look for "d/nopadust"
-      out_dztauname = out_dztauname(1:1)//"opadust"
+      ! if no "d/ndust" in outfile, look for "d/nopa_dust"
+      out_dztauname = out_dztauname(1:1)//"opa_dust"
       status=nf90_inq_varid(outfid,trim(out_dztauname),out_dztauid)
       if (status.ne.nf90_noerr) then
-        tau_ratio_ok = .false.
-        write(*,*)"No dust opacity in the outfile, we'll pass the computation of the CDOD ratio"
+        ! if no "d/ndust" nor d/nopa_dust" in outfile, look for "d/nopadust" (old variable name from aeroptical, before r2817)
+        out_dztauname = out_dztauname(1:1)//"opadust"
+        status=nf90_inq_varid(outfid,trim(out_dztauname),out_dztauid)
+        if (status.ne.nf90_noerr) then
+          tau_ratio_ok = .false.
+          write(*,*)"No dust opacity in the outfile, we skip the computation of the CDOD ratio"
+        endif
       endif
     endif
@@ -1588 +1593 @@
     if (status.ne.nf90_noerr) then
       tau_ratio_ok = .false.
-      write(*,*)"No temperature in the outfile, we'll pass the computation of the CDOD ratio"
+      write(*,*)"No temperature in the obsfile, we skip the computation of the CDOD ratio"
     endif
   endif