Changeset 164 for trunk/LMDZ.MARS/libf/dyn3d

Timestamp:

Jun 17, 2011, 10:49:17 AM (14 years ago)

Author:

emillour

Message:

Mars GCM:

Updates and corrections (to enable compiling/running in debug mode with

ifort)

• removed option "-free-form" from makegcm_ifort and set mod_loc_dir="." so that module files (produced in local directory by ifort) are moved to LIBO
• updated initracer.F, physdem1.F, physiq.F, inichim_newstart.F to avoid referencing out-of-bound array indexes (even if unused)
• cosmetic updates on inwrite.F, datareadnc.F
• updated newstart.F to initialize and use 'datadir' when looking for files
• corrected bug on interpolation of sub-surface temperatures in lect_start_archive.F

EM

Location:

trunk/LMDZ.MARS/libf/dyn3d

Files:

• lect_start_archive.F (modified) (2 diffs)
• newstart.F (modified) (24 diffs)

trunk/LMDZ.MARS/libf/dyn3d/lect_start_archive.F

@@ -1136 +1136 @@
         allocate(oldval(nsoilold+1))
         allocate(newval(nsoilmx))
-        do i=1,imold+1
-         do j=1,jmold+1
+        do i=1,iip1 
+         do j=1,jjp1 
            ! copy values
            oldval(1)=tsurfold(i,j)
@@ -1168 +1168 @@
         oldgrid(1)=0. ! ground
         oldgrid(2:nsoilold+1)=mlayerold(1:nsoilold)
-        do i=1,imold+1
-         do j=1,jmold+1
+        do i=1,iip1 
+         do j=1,jjp1 
            ! copy values
            oldval(1)=tsurfold(i,j)

trunk/LMDZ.MARS/libf/dyn3d/newstart.F

@@ -14 +14 @@
 c
 c=======================================================================
+
+! to use  'getin'
+      USE ioipsl_getincom 
 
       implicit none
@@ -40 +43 @@
 #include"advtrac.h"
 #include"tracer.h"
+#include "datafile.h"
 c=======================================================================
 c   Declarations
@@ -50 +54 @@
 c et autres:
 c----------
-      INTEGER lnblnk
-      EXTERNAL lnblnk
 
 c Variables pour les lectures NetCDF des fichiers "start_archive" 
@@ -358 +360 @@
         relief="mola"
 c     enddo
+
+! before using datareadnc, "datafile" must be set (normaly done in inifis)
+      datafile="/u/forget/WWW/datagcm/datafile" ! default value
+      call getin("datadir",datafile) ! in case user specified another path
 
       CALL datareadnc(relief,phis,alb,surfith,zmeaS,zstdS,zsigS,zgamS,
@@ -499 +505 @@
 
         write(*,*)
-        write(*,*) modif(1:lnblnk(modif)) , ' : '
+        write(*,*) trim(modif) , ' : '
 
 c       'flat : no topography ("aquaplanet")'
 c       -------------------------------------
-        if (modif(1:lnblnk(modif)) .eq. 'flat') then
+        if (trim(modif) .eq. 'flat') then
 c         set topo to zero 
           CALL initial0(ip1jmp1,z_reel)
@@ -537 +543 @@
 c       bilball : albedo, inertie thermique uniforme
 c       --------------------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'bilball') then
+        else if (trim(modif) .eq. 'bilball') then
           write(*,*) 'constante albedo and iner.therm:'
           write(*,*) 'New value for albedo (ex: 0.25) ?'
@@ -564 +570 @@
 c       coldspole : sous-sol de la calotte sud toujours froid
 c       -----------------------------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'coldspole') then
+        else if (trim(modif) .eq. 'coldspole') then
           write(*,*)'new value for the subsurface temperature',
      &   ' beneath the permanent southern polar cap ? (eg: 141 K)'
@@ -615 +621 @@
 c       ptot : Modification of the total pressure: ice + current atmosphere 
 c       -------------------------------------------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'ptot') then
+        else if (trim(modif) .eq. 'ptot') then
 
 c         calcul de la pression totale glace + atm actuelle
@@ -699 +705 @@
 c       q=0 : set tracers to zero
 c       -------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'q=0') then
+        else if (trim(modif) .eq. 'q=0') then
 c          mise a 0 des q (traceurs)
           write(*,*) 'Tracers set to 0 (1.E-30 in fact)'
@@ -721 +727 @@
 c       q=x : initialise tracer manually 
 c       --------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'q=x') then
+        else if (trim(modif) .eq. 'q=x') then
              write(*,*) 'Which tracer do you want to modify ?'
              do iq=1,nqmx
@@ -747 +753 @@
 c       ini_q : Initialize tracers for chemistry
 c       -----------------------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'ini_q') then
+        else if (trim(modif) .eq. 'ini_q') then
 c         For more than 32 layers, possible to initiate thermosphere only     
           thermo=0
@@ -779 +785 @@
 c       ini_q-H2O : as above exept for the water vapour tracer 
 c       ------------------------------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'ini_q-H2O') then
+        else if (trim(modif) .eq. 'ini_q-H2O') then
           ! for more than 32 layers, possible to initiate thermosphere only     
           thermo=0
@@ -812 +818 @@
 c       ini_q-iceH2O : as above exept for ice et H2O
 c       -----------------------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'ini_q-iceH2O') then
+        else if (trim(modif) .eq. 'ini_q-iceH2O') then
 c         For more than 32 layers, possible to initiate thermosphere only     
           thermo=0
@@ -846 +852 @@
 c      wetstart : wet atmosphere with a north to south gradient
 c      --------------------------------------------------------
-       else if (modif(1:lnblnk(modif)) .eq. 'wetstart') then
+       else if (trim(modif) .eq. 'wetstart') then
         ! check that there is indeed a water vapor tracer
         if (igcm_h2o_vap.eq.0) then
@@ -867 +873 @@
 c      noglacier : remove tropical water ice (to initialize high res sim)
 c      --------------------------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'noglacier') then
+        else if (trim(modif) .eq. 'noglacier') then
            do ig=1,ngridmx
              j=(ig-2)/iim +2
@@ -880 +886 @@
 c      watercapn : H20 ice on permanent northern cap
 c      --------------------------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'watercapn') then
+        else if (trim(modif) .eq. 'watercapn') then
            do ig=1,ngridmx
              j=(ig-2)/iim +2
@@ -895 +901 @@
 c      watercaps : H20 ice on permanent southern cap
 c      -------------------------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'watercaps') then
+        else if (trim(modif) .eq. 'watercaps') then
            do ig=1,ngridmx
                j=(ig-2)/iim +2
@@ -910 +916 @@
 c       isotherm : Isothermal temperatures and no winds
 c       ------------------------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'isotherm') then
+        else if (trim(modif) .eq. 'isotherm') then
 
           write(*,*)'Isothermal temperature of the atmosphere, 
@@ -933 +939 @@
 c       co2ice=0 : remove CO2 polar ice caps'
 c       ------------------------------------------------
-        else if (modif(1:lnblnk(modif)) .eq. 'co2ice=0') then
+        else if (trim(modif) .eq. 'co2ice=0') then
            do ig=1,ngridmx
               co2ice(ig)=0
@@ -942 +948 @@
 !       ----------------------------------------------------------------------
 
-        else if (modif(1:lnblnk(modif)).eq.'therm_ini_s') then
+        else if (trim(modif).eq.'therm_ini_s') then
 !          write(*,*)"surfithfi(1):",surfithfi(1)
           do isoil=1,nsoilmx
@@ -965 +971 @@
 !       ------------------------------------------------------------
 
-        else if (modif(1:lnblnk(modif)).eq.'subsoilice_n') then
+        else if (trim(modif).eq.'subsoilice_n') then
 
          write(*,*)'From which latitude (in deg.), up to the north pole,
@@ -1078 +1084 @@
 !       ------------------------------------------------------------
 
-        else if (modif(1:lnblnk(modif)).eq.'subsoilice_s') then
+        else if (trim(modif).eq.'subsoilice_s') then
 
          write(*,*)'From which latitude (in deg.), down to the south pol
@@ -1179 +1185 @@
 c       'mons_ice' : use MONS data to build subsurface ice table
 c       --------------------------------------------------------
-        else if (modif(1:lnblnk(modif)).eq.'mons_ice') then
+        else if (trim(modif).eq.'mons_ice') then
         
        ! 1. Load MONS data
@@ -1285 +1291 @@
         else
           write(*,*) '       Unknown (misspelled?) option!!!'
-        end if ! of if (modif(1:lnblnk(modif)) .eq. '...') elseif ...
+        end if ! of if (trim(modif) .eq. '...') elseif ...
         
        enddo ! of do ! infinite loop on liste of changes