Changeset 552 for trunk/LMDZ.MARS/libf/phymars/tabfi.F

Timestamp:

Mar 2, 2012, 9:53:27 AM (13 years ago)

Author:

emillour

Message:

Mars GCM:

bug fix in "aeronomars/moldiff_red.F90" (wrong mmol array size in included

subroutine) + adapted extreme limit test for H to altitudes of ~4000km
(compatble with 50 layer model).

bug fix in "nirco2abs.F" index of "co2" and "o" tracers were hard coded as

1 and 3!

updates from FGG of euvheat.F, callkeys.h and inifis.F to have the

"euveff" parameter read from callphys.def

EM

File:

• trunk/LMDZ.MARS/libf/phymars/tabfi.F (modified) (18 diffs)

trunk/LMDZ.MARS/libf/phymars/tabfi.F

@@ -81 +81 @@
 c -----------------------
       INTEGER setname, cluvdb, getdat
-
-      INTEGER lnblnk
 
 c-----------------------------------------------------------------------
@@ -296 +294 @@
  
  
-      do while(modif(1:1).ne.'hello')
+      do ! neverending loop
         write(*,*)
         write(*,*)
@@ -306 +304 @@
  
         write(*,*)
-        write(*,*) modif(1:lnblnk(modif)) , ' : '
-
-        if (modif(1:lnblnk(modif)) .eq. 'day_ini') then
+        write(*,*) trim(modif) , ' : '
+
+        if (trim(modif) .eq. 'day_ini') then
           write(*,*) 'current value:',day_ini
           write(*,*) 'enter new value:'
@@ -316 +314 @@
           write(*,*) 'day_ini (new value):',day_ini
 
-        else if (modif(1:lnblnk(modif)) .eq. 'z0') then
+        else if (trim(modif) .eq. 'z0') then
           write(*,*) 'current value (m):',z0_default
           write(*,*) 'enter new value (m):'
@@ -324 +322 @@
           write(*,*) ' z0 (new value):',z0_default
 
-        else if (modif(1:lnblnk(modif)) .eq. 'emin_turb') then
+        else if (trim(modif) .eq. 'emin_turb') then
           write(*,*) 'current value:',emin_turb
           write(*,*) 'enter new value:'
@@ -332 +330 @@
           write(*,*) ' emin_turb (new value):',emin_turb
 
-        else if (modif(1:lnblnk(modif)) .eq. 'lmixmin') then
+        else if (trim(modif) .eq. 'lmixmin') then
           write(*,*) 'current value:',lmixmin
           write(*,*) 'enter new value:'
@@ -340 +338 @@
           write(*,*) ' lmixmin (new value):',lmixmin
 
-        else if (modif(1:lnblnk(modif)) .eq. 'emissiv') then
+        else if (trim(modif) .eq. 'emissiv') then
           write(*,*) 'current value:',emissiv
           write(*,*) 'enter new value:'
@@ -348 +346 @@
           write(*,*) ' emissiv (new value):',emissiv
 
-        else if (modif(1:lnblnk(modif)) .eq. 'emisice') then
+        else if (trim(modif) .eq. 'emisice') then
           write(*,*) 'current value emisice(1) North:',emisice(1)
           write(*,*) 'enter new value:'
@@ -364 +362 @@
           write(*,*) ' emisice(2) (new value):',emisice(2)
 
-        else if (modif(1:lnblnk(modif)) .eq. 'albedice') then
+        else if (trim(modif) .eq. 'albedice') then
           write(*,*) 'current value albedice(1) North:',albedice(1)
           write(*,*) 'enter new value:'
@@ -380 +378 @@
           write(*,*) ' albedice(2) (new value):',albedice(2)
 
-        else if (modif(1:lnblnk(modif)) .eq. 'iceradius') then
+        else if (trim(modif) .eq. 'iceradius') then
           write(*,*) 'current value iceradius(1) North:',iceradius(1)
           write(*,*) 'enter new value:'
@@ -396 +394 @@
           write(*,*) ' iceradius(2) (new value):',iceradius(2)
 
-        else if (modif(1:lnblnk(modif)) .eq. 'dtemisice') then
+        else if (trim(modif) .eq. 'dtemisice') then
           write(*,*) 'current value dtemisice(1) North:',dtemisice(1)
           write(*,*) 'enter new value:'
@@ -412 +410 @@
           write(*,*) ' dtemisice(2) (new value):',dtemisice(2)
 
-        else if (modif(1:lnblnk(modif)) .eq. 'tauvis') then
+        else if (trim(modif) .eq. 'tauvis') then
           write(*,*) 'current value:',tauvis
           write(*,*) 'enter new value:'
@@ -420 +418 @@
           write(*,*) ' tauvis (new value):',tauvis
 
-        else if (modif(1:lnblnk(modif)) .eq. 'obliquit') then
+        else if (trim(modif) .eq. 'obliquit') then
           write(*,*) 'current value:',obliquit
           write(*,*) 'obliquit should be 25.19 on current Mars'
@@ -429 +427 @@
           write(*,*) ' obliquit (new value):',obliquit
 
-        else if (modif(1:lnblnk(modif)) .eq. 'peri_day') then
+        else if (trim(modif) .eq. 'peri_day') then
           write(*,*) 'current value:',peri_day
           write(*,*) 'peri_day should be 485 on current Mars'
@@ -438 +436 @@
           write(*,*) ' peri_day (new value):',peri_day
 
-        else if (modif(1:lnblnk(modif)) .eq. 'periheli') then
+        else if (trim(modif) .eq. 'periheli') then
           write(*,*) 'current value:',periheli
           write(*,*) 'perihelion should be 206.66 on current Mars'
@@ -447 +445 @@
           write(*,*) ' periheli (new value):',periheli
  
-        else if (modif(1:lnblnk(modif)) .eq. 'aphelie') then
+        else if (trim(modif) .eq. 'aphelie') then
           write(*,*) 'current value:',aphelie
           write(*,*) 'aphelion should be 249.22 on current Mars'
@@ -456 +454 @@
           write(*,*) ' aphelie (new value):',aphelie
  
-        else if (modif(1:lnblnk(modif)) .eq. 'volcapa') then
+        else if (trim(modif) .eq. 'volcapa') then
           write(*,*) 'current value:',volcapa
           write(*,*) 'enter new value:'
@@ -465 +463 @@
  
         endif
-      enddo ! of do while(modif(1:1).ne.'hello')
+      enddo ! of do ! neverending loop
 
  999  continue