Changeset 2394 for trunk

Timestamp:

Jul 2, 2020, 3:42:38 PM (4 years ago)

Author:

cmathe

Message:

improvedco2clouds_mod: clean

Location:

trunk/LMDZ.MARS

Files:

• libf/phymars/improvedco2clouds_mod.F90 (modified) (1 diff)
• util/compile (modified) (2 diffs)
• util/concatnc.F90 (modified) (3 diffs)

trunk/LMDZ.MARS/libf/phymars/improvedco2clouds_mod.F90

@@ -528 +528 @@
           zq(ig,l,igcm_co2) = zq(ig,l,igcm_co2) - dMice
         end if
-      end if ! nouveau end if
+      end if ! if zq(ccnco2_number) >= 1
 !----------------------------------------------------------------------------------------------------------------------!
 ! 4.3 Dust cores releasing if no more co2 ice
 !----------------------------------------------------------------------------------------------------------------------!
-        ! On sublime tout
-        if ((zq(ig,l,igcm_co2_ice) <= threshold).or.(zq(ig,l,igcm_ccnco2_number)* tauscaling(ig) < 1.)) then
-
-          if (co2useh2o) then
-
-            if (mem_Mccn_co2(ig,l) > 0) then
-              zq(ig,l,igcm_ccn_mass) = zq(ig,l,igcm_ccn_mass) + mem_Mccn_co2(ig,l)
-            end if
-
-            if (mem_Mh2o_co2(ig,l) > 0) then
-              zq(ig,l,igcm_h2o_ice) = zq(ig,l,igcm_h2o_ice) + mem_Mh2o_co2(ig,l)
-            end if
-
-            if (mem_Nccn_co2(ig,l) > 0) then
-              zq(ig,l,igcm_ccn_number) = zq(ig,l,igcm_ccn_number) + mem_Nccn_co2(ig,l)
-            end if
-
+      ! On sublime tout
+      if ((zq(ig,l,igcm_co2_ice) <= threshold).or.(zq(ig,l,igcm_ccnco2_number) * tauscaling(ig) < 1.)) then
+
+        if (co2useh2o) then
+
+          if (mem_Mccn_co2(ig,l) > 0) then
+            zq(ig,l,igcm_ccn_mass) = zq(ig,l,igcm_ccn_mass) + mem_Mccn_co2(ig,l)
           end if
 
-          zq(ig,l,igcm_dust_mass) = zq(ig,l,igcm_dust_mass) + zq(ig,l,igcm_ccnco2_mass) - ( mem_Mh2o_co2(ig,l) + &
-                                       mem_Mccn_co2(ig,l) )
-
-          zq(ig,l,igcm_dust_number) = zq(ig,l,igcm_dust_number) + zq(ig,l,igcm_ccnco2_number)  - mem_Nccn_co2(ig,l)
-
-          zq(ig,l,igcm_co2) = zq(ig,l,igcm_co2)  + zq(ig,l,igcm_co2_ice)
-
-          zq(ig,l,igcm_co2_ice) = 0.
-          zq(ig,l,igcm_ccnco2_mass) = 0.
-          zq(ig,l,igcm_ccnco2_number) = 0.
-          mem_Nccn_co2(ig,l) = 0.
-          mem_Mh2o_co2(ig,l) = 0.
-          mem_Mccn_co2(ig,l) = 0.
-          riceco2(ig,l) = 0.
-        end if !of if co2_ice < threshold
-!      end if ! of if NCCN > 1
+          if (mem_Mh2o_co2(ig,l) > 0) then
+            zq(ig,l,igcm_h2o_ice) = zq(ig,l,igcm_h2o_ice) + mem_Mh2o_co2(ig,l)
+          end if
+
+          if (mem_Nccn_co2(ig,l) > 0) then
+            zq(ig,l,igcm_ccn_number) = zq(ig,l,igcm_ccn_number) + mem_Nccn_co2(ig,l)
+          end if
+
+        end if
+
+        zq(ig,l,igcm_dust_mass) = zq(ig,l,igcm_dust_mass) + zq(ig,l,igcm_ccnco2_mass) - ( mem_Mh2o_co2(ig,l) + &
+                                     mem_Mccn_co2(ig,l) )
+
+        zq(ig,l,igcm_dust_number) = zq(ig,l,igcm_dust_number) + zq(ig,l,igcm_ccnco2_number)  - mem_Nccn_co2(ig,l)
+
+        zq(ig,l,igcm_co2) = zq(ig,l,igcm_co2)  + zq(ig,l,igcm_co2_ice)
+
+        zq(ig,l,igcm_co2_ice) = 0.
+        zq(ig,l,igcm_ccnco2_mass) = 0.
+        zq(ig,l,igcm_ccnco2_number) = 0.
+        mem_Nccn_co2(ig,l) = 0.
+        mem_Mh2o_co2(ig,l) = 0.
+        mem_Mccn_co2(ig,l) = 0.
+        riceco2(ig,l) = 0.
+      end if !of if co2_ice < threshold or zq(ccnco2_number) < 1
     end do ! of ig loop
   end do ! of nlayer loop

trunk/LMDZ.MARS/util/compile

@@ -3 +3 @@
 # > compile concat
 # > compile zrecast
+
+# get from:
+#   $>:module list
+# copy the netcdf module used (i.e. netcdf4/4.5.0-ifort15)
+#   $>:module display netcdf4/4.5.0-ifort15
+NETCDF='/opt/netcdf45/ifort15'
 
 # pgf90 -Bstatic   $1.F90 \
@@ -9 +15 @@
 
 #ifort $1.F90 \
-#pgf90 $1.F90 \
+#pgf90 -Bstatic $1.F90 \
 ifort $1.F90 \
 -I$NETCDF/include \
--L$NETCDF/lib -lnetcdf -o $1.e
+#-L$NETCDF/lib -lnetcdf -o $1.e
+-L$NETCDF/lib -lnetcdff -o $1.e # on centos 7
 
 # Before running that on you computer you might want to change :

trunk/LMDZ.MARS/util/concatnc.F90

@@ -28 +28 @@
 include "netcdf.inc" ! NetCDF definitions
 
-character (len=80), dimension(1000) :: file
+character (len=256), dimension(1000) :: file
 ! file(): input file(s) names(s)
 character (len=30), dimension(16) :: notconcat
@@ -34 +34 @@
 character (len=50), dimension(:), allocatable :: var
 ! var(): name(s) of variable(s) that will be concatenated
-character (len=50) :: tmpvar,tmpfile,title,units
+character (len=256) :: tmpvar,tmpfile,title,units
 ! tmpvar(): used to temporarily store a variable name
 ! tmpfile(): used to temporarily store a file name
@@ -138 +138 @@
 
 nbfile=0
-read(*,'(a50)') tmpfile
+read(*,'(a256)') tmpfile
 do While (len_trim(tmpfile).ne.0)
    nbfile=nbfile+1
    file(nbfile)=tmpfile
-   read(*,'(a50)') tmpfile
+   read(*,'(a256)') tmpfile
 enddo