Changeset 2440 for trunk

Timestamp:

Jan 12, 2021, 5:40:13 PM (4 years ago)

Author:

abierjon

Message:

Mars GCM:
Harmonization of the utility programs lslin, concatnc and localtime when dealing
with Solar longitude as the Time variable (for localtime, the check on long_name
attribute is still compliant with files from previous versions)

AB

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• util/concatnc.F90 (modified) (2 diffs)
• util/localtime.F90 (modified) (1 diff)

trunk/LMDZ.MARS/README

@@ -3247 +3247 @@
 Fix a typo made in r2434 in localtime.F90, that replaced the long_name attribute
 of variables by "Time"
+
+== 12/01/2021 == AB
+Harmonization of the utility programs lslin, concatnc and localtime when dealing
+with Solar longitude as the Time variable (for localtime, the check on long_name
+attribute is still compliant with files from previous versions)

trunk/LMDZ.MARS/util/concatnc.F90

@@ -774 +774 @@
 !==============================================================================
 if (axis=="ls") then
-  call def_var(nout,"Time","Solar longitude","degree",1,&
+  call def_var(nout,"Time","Ls (Solar Longitude)","degrees",1,&
              (/timedimout/),timevarout,ierr)
 else 
@@ -1279 +1279 @@
 else ! if (axis.eq."adls")
    write(*,*) "Adding Ls as a 1D time variable"
-   call def_var(nout,"Ls","Solar Longitude","degree",1, (/timedimout/),nvarid,ierr)
+   call def_var(nout,"Ls","Ls (Solar Longitude)","degrees",1, (/timedimout/),nvarid,ierr)
 end if
 

trunk/LMDZ.MARS/util/localtime.F90

@@ -404 +404 @@
      ierr=nf_get_att_text(nid,timevar,"title",long_name)
    endif
-   if ((ierr.EQ.NF_NOERR).and.(long_name.eq."Solar longitude")) then
+   if ((ierr.EQ.NF_NOERR).and.(index(long_name,"Solar").ne.0)) then
+     ! if long_name contains "Solar"
      write(*,*) "ERROR: Time axis in input file is in Solar Longitude!"
      write(*,*) "       localtime requires sols as time axis!"